diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-04 11:03:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-04 11:03:20 -0800 |
| commit | 4d4bac4499e9955521af80198063ef9c2f2bd634 (patch) | |
| tree | b02fb1f3d343d3a4a9864be18eec04e10f43d410 /include/linux/usb/usb_phy_generic.h | |
| parent | 7fa40910e0bf5ef32eca49595d950cb24f6402bf (diff) | |
| parent | 9298b4aad37e8c6962edcdbd0b62620adb207d03 (diff) | |
| download | talos-op-linux-4d4bac4499e9955521af80198063ef9c2f2bd634.tar.gz talos-op-linux-4d4bac4499e9955521af80198063ef9c2f2bd634.zip | |
Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.20 merge window
Here's the big pull request for Gadgets and PHYs. It's
a total of 217 non-merge commits with pretty much everything
being touched.
The most important bits are a ton of new documentation for
almost all usb gadget functions, a new isp1760 UDC driver,
several improvements to the old net2280 UDC driver, and
some minor tracepoint improvements to dwc3.
Other than that, a big list of minor cleanups, smaller bugfixes
and new features all over the place.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/usb/usb_phy_generic.h')
| -rw-r--r-- | include/linux/usb/usb_phy_generic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/usb_phy_generic.h b/include/linux/usb/usb_phy_generic.h index 68adae83affc..c13632d5292e 100644 --- a/include/linux/usb/usb_phy_generic.h +++ b/include/linux/usb/usb_phy_generic.h @@ -2,6 +2,7 @@ #define __LINUX_USB_NOP_XCEIV_H #include <linux/usb/otg.h> +#include <linux/gpio/consumer.h> struct usb_phy_generic_platform_data { enum usb_phy_type type; @@ -11,6 +12,7 @@ struct usb_phy_generic_platform_data { unsigned int needs_vcc:1; unsigned int needs_reset:1; /* deprecated */ int gpio_reset; + struct gpio_desc *gpiod_vbus; }; #if IS_ENABLED(CONFIG_NOP_USB_XCEIV) |
