History

Merge tag 'usb-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB / Thunderbolt updates from Greg KH: "Here is the big set of USB and Thunderbolt changes for 6.13-rc1. Overall, a pretty slow development cycle, the majority of the work going into the debugfs interface for the thunderbolt (i.e. USB4) code, to help with debugging the myrad ways that hardware vendors get their interfaces messed up. Other than that, here's the highlights: - thunderbolt changes and additions to debugfs interfaces - lots of device tree updates for new and old hardware - UVC configfs gadget updates and new apis for features - xhci driver updates and fixes - dwc3 driver updates and fixes - typec driver updates and fixes - lots of other small updates and fixes, full details in the shortlog All of these have been in linux-next for a while with no reported problems" * tag 'usb-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (148 commits) usb: typec: tcpm: Add support for sink-bc12-completion-time-ms DT property dt-bindings: usb: maxim,max33359: add usage of sink bc12 time property dt-bindings: connector: Add time property for Sink BC12 detection completion usb: dwc3: gadget: Remove dwc3_request->needs_extra_trb usb: dwc3: gadget: Cleanup SG handling usb: dwc3: gadget: Fix looping of queued SG entries usb: dwc3: gadget: Fix checking for number of TRBs left usb: dwc3: ep0: Don't clear ep0 DWC3_EP_TRANSFER_STARTED Revert "usb: gadget: composite: fix OS descriptors w_value logic" usb: ehci-spear: fix call balance of sehci clk handling routines USB: make to_usb_device_driver() use container_of_const() USB: make to_usb_driver() use container_of_const() USB: properly lock dynamic id list when showing an id USB: make single lock for all usb dynamic id lists drivers/usb/storage: refactor min with min_t drivers/usb/serial: refactor min with min_t drivers/usb/musb: refactor min/max with min_t/max_t drivers/usb/mon: refactor min with min_t drivers/usb/misc: refactor min with min_t drivers/usb/host: refactor min/max with min_t/max_t ...

Linus Torvalds committed 1 year ago

Commit e33a6d82 parents 93e064c 237d4e0257 files · +3502 −1349Browse files

Showing the changes to include/uapi (1 of 257 files). Show all

Unified · Split

include/uapi/linux/usb/video.h+58−0
@@ -597,5 +597,63 @@ struct UVC_FRAME_MJPEG(n) { \ · 596 unmodified lines
597 __le32 dwFrameInterval[n]; \597 __le32 dwFrameInterval[n]; \
598} __attribute__ ((packed))598} __attribute__ ((packed))
599 599
600/* Frame Based Payload - 3.1.1. Frame Based Video Format Descriptor */
601struct uvc_format_framebased {
602 __u8 bLength;
603 __u8 bDescriptorType;
604 __u8 bDescriptorSubType;
605 __u8 bFormatIndex;
606 __u8 bNumFrameDescriptors;
607 __u8 guidFormat[16];
608 __u8 bBitsPerPixel;
609 __u8 bDefaultFrameIndex;
610 __u8 bAspectRatioX;
611 __u8 bAspectRatioY;
612 __u8 bmInterfaceFlags;
613 __u8 bCopyProtect;
614 __u8 bVariableSize;
615} __attribute__((__packed__));
616
617#define UVC_DT_FORMAT_FRAMEBASED_SIZE 28
618
619/* Frame Based Payload - 3.1.2. Frame Based Video Frame Descriptor */
620struct uvc_frame_framebased {
621 __u8 bLength;
622 __u8 bDescriptorType;
623 __u8 bDescriptorSubType;
624 __u8 bFrameIndex;
625 __u8 bmCapabilities;
626 __u16 wWidth;
627 __u16 wHeight;
628 __u32 dwMinBitRate;
629 __u32 dwMaxBitRate;
630 __u32 dwDefaultFrameInterval;
631 __u8 bFrameIntervalType;
632 __u32 dwBytesPerLine;
633 __u32 dwFrameInterval[];
634} __attribute__((__packed__));
635
636#define UVC_DT_FRAME_FRAMEBASED_SIZE(n) (26+4*(n))
637
638#define UVC_FRAME_FRAMEBASED(n) \
639 uvc_frame_framebased_##n
640
641#define DECLARE_UVC_FRAME_FRAMEBASED(n) \
642struct UVC_FRAME_FRAMEBASED(n) { \
643 __u8 bLength; \
644 __u8 bDescriptorType; \
645 __u8 bDescriptorSubType; \
646 __u8 bFrameIndex; \
647 __u8 bmCapabilities; \
648 __u16 wWidth; \
649 __u16 wHeight; \
650 __u32 dwMinBitRate; \
651 __u32 dwMaxBitRate; \
652 __u32 dwDefaultFrameInterval; \
653 __u8 bFrameIntervalType; \
654 __u32 dwBytesPerLine; \
655 __u32 dwFrameInterval[n]; \
656} __attribute__ ((packed))
657
600#endif /* __LINUX_USB_VIDEO_H */658#endif /* __LINUX_USB_VIDEO_H */
601 659