History

Merge tag 'usb-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes: USB: changes for v5.8 merge window Rather busy cycle. We have a total 99 non-merge commits going into v5.8 merge window. The majority of the changes are in dwc3 this around (31.7% of all changes). It's composed mostly Thinh's recent updates to get dwc3 to behave correctly with stream transfers. We have also have Roger's for Keystone platforms and Neil's updates for the meson glue layer. Apart from those, we have the usual set of non-critical fixes, new device IDs, spelling fixes all over the place. Signed-off-by: Felipe Balbi <balbi@kernel.org> * tag 'usb-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (99 commits) usb: dwc3: keystone: Turn on USB3 PHY before controller dt-bindings: usb: ti,keystone-dwc3.yaml: Add USB3.0 PHY property dt-bindings: usb: convert keystone-usb.txt to YAML usb: dwc3: gadget: Check for prepared TRBs usb: gadget: Fix issue with config_ep_by_speed function usb: cdns3: ep0: delete the redundant status stage usb: dwc2: Update Core Reset programming flow. usb: gadget: fsl: Fix a wrong judgment in fsl_udc_probe() usb: gadget: fix potential double-free in m66592_probe. usb: cdns3: Fix runtime PM imbalance on error usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check usb: dwc3: Increase timeout for CmdAct cleared by device controller USB: dummy-hcd: use configurable endpoint naming scheme usb: cdns3: gadget: assign interrupt number to USB gadget structure usb: gadget: core: sync interrupt before unbind the udc arm64: dts: qcom: sc7180: Add interconnect properties for USB arm64: dts: qcom: sdm845: Add interconnect properties for USB dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver ARM: dts: at91: Remove the USB EP child node dt-bindings: usb: atmel: Mark EP child node as deprecated ...

Greg Kroah-Hartman committed 6 years ago

Commit ca681aa2 parents 14f3a5c 1c11e74116 files · +2107 −1700Browse files

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

Unified · Split

2 files
  1. include/linux/usb/composite.h +3 −0
  2. include/linux/usb/gadget.h +8 −0
include/linux/usb/composite.h+3−0
@@ -249,6 +249,9 @@ int usb_function_activate(struct usb_function *); · 248 unmodified lines
249 249
250int usb_interface_id(struct usb_configuration *, struct usb_function *);250int usb_interface_id(struct usb_configuration *, struct usb_function *);
251 251
252int config_ep_by_speed_and_alt(struct usb_gadget *g, struct usb_function *f,
253 struct usb_ep *_ep, u8 alt);
254
252int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,255int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
253 struct usb_ep *_ep);256 struct usb_ep *_ep);
254 257
include/linux/usb/gadget.h+8−0
@@ -42,6 +42,8 @@ struct usb_ep; · 41 unmodified lines
42 * @num_mapped_sgs: number of SG entries mapped to DMA (internal)42 * @num_mapped_sgs: number of SG entries mapped to DMA (internal)
43 * @length: Length of that data43 * @length: Length of that data
44 * @stream_id: The stream id, when USB3.0 bulk streams are being used44 * @stream_id: The stream id, when USB3.0 bulk streams are being used
45 * @is_last: Indicates if this is the last request of a stream_id before
46 * switching to a different stream (required for DWC3 controllers).
45 * @no_interrupt: If true, hints that no completion irq is needed.47 * @no_interrupt: If true, hints that no completion irq is needed.
46 * Helpful sometimes with deep request queues that are handled48 * Helpful sometimes with deep request queues that are handled
47 * directly by DMA controllers.49 * directly by DMA controllers.
@@ -104,6 +106,7 @@ struct usb_request { · 56 unmodified lines
104 unsigned num_mapped_sgs;106 unsigned num_mapped_sgs;
105 107
106 unsigned stream_id:16;108 unsigned stream_id:16;
109 unsigned is_last:1;
107 unsigned no_interrupt:1;110 unsigned no_interrupt:1;
108 unsigned zero:1;111 unsigned zero:1;
109 unsigned short_not_ok:1;112 unsigned short_not_ok:1;
@@ -373,6 +376,7 @@ struct usb_gadget_ops { · 263 unmodified lines
373 * @connected: True if gadget is connected.376 * @connected: True if gadget is connected.
374 * @lpm_capable: If the gadget max_speed is FULL or HIGH, this flag377 * @lpm_capable: If the gadget max_speed is FULL or HIGH, this flag
375 * indicates that it supports LPM as per the LPM ECN & errata.378 * indicates that it supports LPM as per the LPM ECN & errata.
379 * @irq: the interrupt number for device controller.
376 *380 *
377 * Gadgets have a mostly-portable "gadget driver" implementing device381 * Gadgets have a mostly-portable "gadget driver" implementing device
378 * functions, handling all usb configurations and interfaces. Gadget382 * functions, handling all usb configurations and interfaces. Gadget
@@ -427,6 +431,7 @@ struct usb_gadget { · 48 unmodified lines
427 unsigned deactivated:1;431 unsigned deactivated:1;
428 unsigned connected:1;432 unsigned connected:1;
429 unsigned lpm_capable:1;433 unsigned lpm_capable:1;
434 int irq;
430};435};
431#define work_to_gadget(w) (container_of((w), struct usb_gadget, work))436#define work_to_gadget(w) (container_of((w), struct usb_gadget, work))
432 437
@@ -773,6 +778,9 @@ struct usb_gadget_string_container { · 340 unmodified lines
773/* put descriptor for string with that id into buf (buflen >= 256) */778/* put descriptor for string with that id into buf (buflen >= 256) */
774int usb_gadget_get_string(const struct usb_gadget_strings *table, int id, u8 *buf);779int usb_gadget_get_string(const struct usb_gadget_strings *table, int id, u8 *buf);
775 780
781/* check if the given language identifier is valid */
782bool usb_validate_langid(u16 langid);
783
776/*-------------------------------------------------------------------------*/784/*-------------------------------------------------------------------------*/
777 785
778/* utility to simplify managing config descriptors */786/* utility to simplify managing config descriptors */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t