diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-24 16:18:40 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-24 16:18:40 +0100 |
commit | 5328f35b1584a9849ffe46afa42018946aa43851 (patch) | |
tree | f939d0577ae13ed22069ac4188ce21bacc7a3af5 /include/linux/usb/usb_phy_gen_xceiv.h | |
parent | e3967e7b28de70d28313cc93d831d8525083097f (diff) | |
parent | 80d7d8a768cda6e8a08ab805a977d08741011da1 (diff) | |
download | linux-stable-5328f35b1584a9849ffe46afa42018946aa43851.tar.gz linux-stable-5328f35b1584a9849ffe46afa42018946aa43851.tar.bz2 linux-stable-5328f35b1584a9849ffe46afa42018946aa43851.zip |
Merge tag 'usb-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.13
Final conversions to configfs for mass storage, acm_ms, and
multi gadgets.
MUSB should now work out of the box on AM335x-based boards
(beagle bone white and black) with DMA thanks to Sebastian's
work.
We can now enable VERBOSE_DEBUG on builds of drivers/usb/gadget/
by selecting CONFIG_USB_GADGET_VERBOSE.
s3c-hsotg got quite a few non-critical fixes but also learned
a few new tricks (isochronous transfers, multi count support).
The Marvel USB3 Controller driver got a memory leak fix.
devm_usb_get_phy() learned not to return NULL, ever.
Other than these patches, we have the usual set of cleanups
ranging from removal of unnecessary *_set_drvdata() to using
SIMPLE_DEV_PM_OPS.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/usb/usb_phy_gen_xceiv.h')
-rw-r--r-- | include/linux/usb/usb_phy_gen_xceiv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/usb_phy_gen_xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h index 11d85b9c1b08..cc8d818a83be 100644 --- a/include/linux/usb/usb_phy_gen_xceiv.h +++ b/include/linux/usb/usb_phy_gen_xceiv.h @@ -9,7 +9,8 @@ struct usb_phy_gen_xceiv_platform_data { /* if set fails with -EPROBE_DEFER if can't get regulator */ unsigned int needs_vcc:1; - unsigned int needs_reset:1; + unsigned int needs_reset:1; /* deprecated */ + int gpio_reset; }; #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) |