History

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

Pull USB and Thunderbolt driver updates from Greg KH: "Here is the large set of USB and Thunderbolt driver changes for 6.2-rc1. Overall, thanks to the removal of a driver, more lines were removed than added, a nice change. Highlights include: - removal of the sisusbvga driver that was not used by anyone anymore - minor thunderbolt driver changes and tweaks - chipidea driver updates - usual set of typec driver features and hardware support added - musb minor driver fixes - fotg210 driver fixes, bringing that hardware back from the "dead" - minor dwc3 driver updates - addition, and then removal, of a list.h helper function for many USB and other subsystem drivers, that ended up breaking the build. That will come back for 6.3-rc1, it missed this merge window. - usual xhci updates and enhancements - usb-serial driver updates and support for new devices - other minor USB driver updates All of these have been in linux-next for a while with no reported problems" * tag 'usb-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (153 commits) usb: gadget: uvc: Rename bmInterfaceFlags -> bmInterlaceFlags usb: dwc2: power on/off phy for peripheral mode in dual-role mode usb: dwc2: disable lpm feature on Rockchip SoCs dt-bindings: usb: mtk-xhci: add support for mt7986 usb: dwc3: core: defer probe on ulpi_read_id timeout usb: ulpi: defer ulpi_register on ulpi_read_id timeout usb: misc: onboard_usb_hub: add Genesys Logic GL850G hub support dt-bindings: usb: Add binding for Genesys Logic GL850G hub controller dt-bindings: vendor-prefixes: add Genesys Logic usb: fotg210-udc: fix potential memory leak in fotg210_udc_probe() usb: typec: tipd: Set mode of operation for USB Type-C connector usb: gadget: udc: drop obsolete dependencies on COMPILE_TEST usb: musb: remove extra check in musb_gadget_vbus_draw usb: gadget: uvc: Prevent buffer overflow in setup handler usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init usb: typec: wusb3801: fix fwnode refcount leak in wusb3801_probe() usb: storage: Add check for kcalloc USB: sisusbvga: use module_usb_driver() USB: sisusbvga: rename sisusb.c to sisusbvga.c USB: sisusbvga: remove console support ...

Linus Torvalds committed 3 years ago

Commit 58bcac12 parents 84e57d2 81c2524163 files · +2079 −7049Browse files

Showing the changes to include/uapi (2 of 163 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/usb/g_uvc.h +3 −0
  2. include/uapi/linux/usb/video.h +2 −2
include/uapi/linux/usb/g_uvc.h+3−0
@@ -21,6 +21,9 @@ · 20 unmodified lines
2121 #define UVC_EVENT_DATA (V4L2_EVENT_PRIVATE_START + 5)
2222 #define UVC_EVENT_LAST (V4L2_EVENT_PRIVATE_START + 5)
2323
24+#define UVC_STRING_CONTROL_IDX 0
25+#define UVC_STRING_STREAMING_IDX 1
26+
2427 struct uvc_request_data {
2528 __s32 length;
2629 __u8 data[60];
include/uapi/linux/usb/video.h+2−2
@@ -466,7 +466,7 @@ struct uvc_format_uncompressed { · 465 unmodified lines
466466 __u8 bDefaultFrameIndex;
467467 __u8 bAspectRatioX;
468468 __u8 bAspectRatioY;
469− __u8 bmInterfaceFlags;
469+ __u8 bmInterlaceFlags;
470470 __u8 bCopyProtect;
471471 } __attribute__((__packed__));
472472
@@ -522,7 +522,7 @@ struct uvc_format_mjpeg { · 49 unmodified lines
522522 __u8 bDefaultFrameIndex;
523523 __u8 bAspectRatioX;
524524 __u8 bAspectRatioY;
525− __u8 bmInterfaceFlags;
525+ __u8 bmInterlaceFlags;
526526 __u8 bCopyProtect;
527527 } __attribute__((__packed__));
528528