History

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

Pull USB/PHY updates from Greg KH: "Here is the big patchset of USB and PHY driver updates for 4.13-rc1. On the PHY side, they decided to move files around to "make things easier" in their tree. Hopefully that wasn't a mistake, but in linux-next testing, we haven't had any reported problems. There's the usual set of gadget and xhci and musb updates in here as well, along with a number of smaller updates for a raft of different USB drivers. Full details in the shortlog, nothing really major. All of these have been in linux-next for a while with no reported issues" * tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (173 commits) Add USB quirk for HVR-950q to avoid intermittent device resets USB hub_probe: rework ugly goto-into-compound-statement usb: host: ohci-pxa27x: Handle return value of clk_prepare_enable USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick usbip: Fix uninitialized variable bug in vhci usb: core: read USB ports from DT in the usbport LED trigger driver dt-bindings: leds: document new trigger-sources property usb: typec: ucsi: Add ACPI driver usb: typec: Add support for UCSI interface usb: musb: compress return logic into one line USB: serial: propagate late probe errors USB: serial: refactor port endpoint setup usb: musb: tusb6010_omap: Convert to DMAengine API ARM: OMAP2+: DMA: Add slave map entries for 24xx external request lines usb: musb: tusb6010: Handle DMA TX completion in DMA callback as well usb: musb: tusb6010_omap: Allocate DMA channels upfront usb: musb: tusb6010_omap: Create new struct for DMA data/parameters usb: musb: tusb6010_omap: Use one musb_ep_select call in tusb_omap_dma_program usb: musb: tusb6010: Add MUSB_G_NO_SKB_RESERVE to quirks usb: musb: Add quirk to avoid skb reserve in gadget mode ...

Linus Torvalds committed 9 years ago

Commit 362f6722 parents 4422d80 6836796245 files · +11039 −4437Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/usb/functionfs.h +4 −3
  2. include/uapi/linux/usbdevice_fs.h +6 −0
include/uapi/linux/usb/functionfs.h+4−3
@@ -275,13 +275,14 @@ struct usb_functionfs_event { · 274 unmodified lines
275275 #define FUNCTIONFS_INTERFACE_REVMAP _IO('g', 128)
276276
277277 /*
278− * Returns real bEndpointAddress of an endpoint. If function is not
279− * active returns -ENODEV.
278+ * Returns real bEndpointAddress of an endpoint. If endpoint shuts down
279+ * during the call, returns -ESHUTDOWN.
280280 */
281281 #define FUNCTIONFS_ENDPOINT_REVMAP _IO('g', 129)
282282
283283 /*
284− * Returns endpoint descriptor. If function is not active returns -ENODEV.
284+ * Returns endpoint descriptor. If endpoint shuts down during the call,
285+ * returns -ESHUTDOWN.
285286 */
286287 #define FUNCTIONFS_ENDPOINT_DESC _IOR('g', 130, \
287288 struct usb_endpoint_descriptor)
include/uapi/linux/usbdevice_fs.h+6−0
@@ -156,6 +156,11 @@ struct usbdevfs_streams { · 155 unmodified lines
156156 unsigned char eps[0];
157157 };
158158
159+/*
160+ * USB_SPEED_* values returned by USBDEVFS_GET_SPEED are defined in
161+ * linux/usb/ch9.h
162+ */
163+
159164 #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer)
160165 #define USBDEVFS_CONTROL32 _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
161166 #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer)
@@ -190,5 +195,6 @@ struct usbdevfs_streams { · 28 unmodified lines
190195 #define USBDEVFS_ALLOC_STREAMS _IOR('U', 28, struct usbdevfs_streams)
191196 #define USBDEVFS_FREE_STREAMS _IOR('U', 29, struct usbdevfs_streams)
192197 #define USBDEVFS_DROP_PRIVILEGES _IOW('U', 30, __u32)
198+#define USBDEVFS_GET_SPEED _IO('U', 31)
193199
194200 #endif /* _UAPI_LINUX_USBDEVICE_FS_H */