Pull USB patches from Greg Kroah-Hartman: "Here's the big USB pull request for 3.10-rc1. Lots of USB patches here, the majority being USB gadget changes and USB-serial driver cleanups, the rest being ARM build fixes / cleanups, and individual driver updates. We also finally got some chipidea fixes, which have been delayed for a number of kernel releases, as the maintainer has now reappeared. All of these have been in linux-next for a while" * tag 'usb-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (568 commits) USB: ehci-msm: USB_MSM_OTG needs USB_PHY USB: OHCI: avoid conflicting platform drivers USB: OMAP: ISP1301 needs USB_PHY USB: lpc32xx: ISP1301 needs USB_PHY USB: ftdi_sio: enable two UART ports on ST Microconnect Lite usb: phy: tegra: don't call into tegra-ehci directly usb: phy: phy core cannot yet be a module USB: Fix initconst in ehci driver usb-storage: CY7C68300A chips do not support Cypress ATACB USB: serial: option: Added support Olivetti Olicard 145 USB: ftdi_sio: correct ST Micro Connect Lite PIDs ARM: mxs_defconfig: add CONFIG_USB_PHY ARM: imx_v6_v7_defconfig: add CONFIG_USB_PHY usb: phy: remove exported function from __init section usb: gadget: zero: put function instances on unbind usb: gadget: f_sourcesink.c: correct a copy-paste misnomer usb: gadget: cdc2: fix error return code in cdc_do_config() usb: gadget: multi: fix error return code in rndis_do_config() usb: gadget: f_obex: fix error return code in obex_bind() USB: storage: convert to use module_usb_driver() ...
Showing the changes to include/uapi/linux (2 of 323 files). Show all
Unified · Split
| @@ -0,0 +1,21 @@ | |||
| 1 | /* | ||
| 2 | * USB CDC Device Management userspace API definitions | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or | ||
| 5 | * modify it under the terms of the GNU General Public License | ||
| 6 | * version 2 as published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _UAPI__LINUX_USB_CDC_WDM_H | ||
| 10 | #define _UAPI__LINUX_USB_CDC_WDM_H | ||
| 11 | |||
| 12 | /* | ||
| 13 | * This IOCTL is used to retrieve the wMaxCommand for the device, | ||
| 14 | * defining the message limit for both reading and writing. | ||
| 15 | * | ||
| 16 | * For CDC WDM functions this will be the wMaxCommand field of the | ||
| 17 | * Device Management Functional Descriptor. | ||
| 18 | */ | ||
| 19 | #define IOCTL_WDM_MAX_COMMAND _IOR('H', 0xA0, __u16) | ||
| 20 | |||
| 21 | #endif /* _UAPI__LINUX_USB_CDC_WDM_H */ | ||
| @@ -138,7 +138,7 @@ · 137 unmodified lines | |||
| 138 | 138 | ||
| 139 | /* | 139 | /* |
| 140 | * New Feature Selectors as added by USB 3.0 | 140 | * New Feature Selectors as added by USB 3.0 |
| 141 | * See USB 3.0 spec Table 9-6 | 141 | * See USB 3.0 spec Table 9-7 |
| 142 | */ | 142 | */ |
| 143 | #define USB_DEVICE_U1_ENABLE 48 /* dev may initiate U1 transition */ | 143 | #define USB_DEVICE_U1_ENABLE 48 /* dev may initiate U1 transition */ |
| 144 | #define USB_DEVICE_U2_ENABLE 49 /* dev may initiate U2 transition */ | 144 | #define USB_DEVICE_U2_ENABLE 49 /* dev may initiate U2 transition */ |
| @@ -147,7 +147,7 @@ · 2 unmodified lines | |||
| 147 | 147 | ||
| 148 | #define USB_INTR_FUNC_SUSPEND_OPT_MASK 0xFF00 | 148 | #define USB_INTR_FUNC_SUSPEND_OPT_MASK 0xFF00 |
| 149 | /* | 149 | /* |
| 150 | * Suspend Options, Table 9-7 USB 3.0 spec | 150 | * Suspend Options, Table 9-8 USB 3.0 spec |
| 151 | */ | 151 | */ |
| 152 | #define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0)) | 152 | #define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0)) |
| 153 | #define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1)) | 153 | #define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1)) |