History

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

Pull USB/Thunderbolt updates from Greg KH: "Here is the large set of USB and Thunderbolt patches for 5.9-rc1. Nothing really magic/major in here, just lots of little changes and updates: - clean up language usages in USB core and some drivers - Thunderbolt driver updates and additions - USB Gadget driver updates - dwc3 driver updates (like always...) - build with "W=1" warning fixups - mtu3 driver updates - usb-serial driver updates and device ids - typec additions and updates for new hardware - xhci debug code updates for future platforms - cdns3 driver updates - lots of other minor driver updates and fixes and cleanups All of these have been in linux-next for a while with no reported issues" * tag 'usb-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (330 commits) usb: common: usb-conn-gpio: Register charger usb: mtu3: simplify mtu3_req_complete() usb: mtu3: clear dual mode of u3port when disable device usb: mtu3: use MTU3_EP_WEDGE flag usb: mtu3: remove useless member @busy in mtu3_ep struct usb: mtu3: remove repeated error log usb: mtu3: add ->udc_set_speed() usb: mtu3: introduce a funtion to check maximum speed usb: mtu3: clear interrupts status when disable interrupts usb: mtu3: reinitialize CSR registers usb: mtu3: fix macro for maximum number of packets usb: mtu3: remove unnecessary pointer checks usb: xhci: Fix ASMedia ASM1142 DMA addressing usb: xhci: define IDs for various ASMedia host controllers usb: musb: convert to devm_platform_ioremap_resource_byname usb: gadget: tegra-xudc: convert to devm_platform_ioremap_resource_byname usb: gadget: r8a66597: convert to devm_platform_ioremap_resource_byname usb: dwc3: convert to devm_platform_ioremap_resource_byname usb: cdns3: convert to devm_platform_ioremap_resource_byname usb: phy: am335x: convert to devm_platform_ioremap_resource_byname ...

Linus Torvalds committed 6 years ago

Commit ecfd7942 parents dd27111 e3ee0e7297 files · +7847 −3089Browse files

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

Unified · Split

include/uapi/linux/usb/ch9.h+12−5
@@ -138,11 +138,11 @@ · 137 unmodified lines
138 * Test Mode Selectors138 * Test Mode Selectors
139 * See USB 2.0 spec Table 9-7139 * See USB 2.0 spec Table 9-7
140 */140 */
141#define TEST_J 1141#define USB_TEST_J 1
142#define TEST_K 2142#define USB_TEST_K 2
143#define TEST_SE0_NAK 3143#define USB_TEST_SE0_NAK 3
144#define TEST_PACKET 4144#define USB_TEST_PACKET 4
145#define TEST_FORCE_EN 5145#define USB_TEST_FORCE_ENABLE 5
146 146
147/* Status Type */147/* Status Type */
148#define USB_STATUS_TYPE_STANDARD 0148#define USB_STATUS_TYPE_STANDARD 0
@@ -326,6 +326,10 @@ struct usb_device_descriptor { · 177 unmodified lines
326#define USB_CLASS_CONTENT_SEC 0x0d /* content security */326#define USB_CLASS_CONTENT_SEC 0x0d /* content security */
327#define USB_CLASS_VIDEO 0x0e327#define USB_CLASS_VIDEO 0x0e
328#define USB_CLASS_WIRELESS_CONTROLLER 0xe0328#define USB_CLASS_WIRELESS_CONTROLLER 0xe0
329#define USB_CLASS_PERSONAL_HEALTHCARE 0x0f
330#define USB_CLASS_AUDIO_VIDEO 0x10
331#define USB_CLASS_BILLBOARD 0x11
332#define USB_CLASS_USB_TYPE_C_BRIDGE 0x12
329#define USB_CLASS_MISC 0xef333#define USB_CLASS_MISC 0xef
330#define USB_CLASS_APP_SPEC 0xfe334#define USB_CLASS_APP_SPEC 0xfe
331#define USB_CLASS_VENDOR_SPEC 0xff335#define USB_CLASS_VENDOR_SPEC 0xff
@@ -364,6 +368,9 @@ struct usb_config_descriptor { · 32 unmodified lines
364 368
365/*-------------------------------------------------------------------------*/369/*-------------------------------------------------------------------------*/
366 370
371/* USB String descriptors can contain at most 126 characters. */
372#define USB_MAX_STRING_LEN 126
373
367/* USB_DT_STRING: String descriptor */374/* USB_DT_STRING: String descriptor */
368struct usb_string_descriptor {375struct usb_string_descriptor {
369 __u8 bLength;376 __u8 bLength;