diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-24 11:18:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-24 11:18:40 -0400 |
| commit | 5328f35b1584a9849ffe46afa42018946aa43851 (patch) | |
| tree | f939d0577ae13ed22069ac4188ce21bacc7a3af5 /include/linux/platform_data | |
| parent | e3967e7b28de70d28313cc93d831d8525083097f (diff) | |
| parent | 80d7d8a768cda6e8a08ab805a977d08741011da1 (diff) | |
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/platform_data')
| -rw-r--r-- | include/linux/platform_data/usb-rcar-gen2-phy.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/platform_data/usb-rcar-gen2-phy.h b/include/linux/platform_data/usb-rcar-gen2-phy.h new file mode 100644 index 000000000000..dd3ba46c0d90 --- /dev/null +++ b/include/linux/platform_data/usb-rcar-gen2-phy.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2013 Renesas Solutions Corp. | ||
| 3 | * Copyright (C) 2013 Cogent Embedded, Inc. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __USB_RCAR_GEN2_PHY_H | ||
| 11 | #define __USB_RCAR_GEN2_PHY_H | ||
| 12 | |||
| 13 | #include <linux/types.h> | ||
| 14 | |||
| 15 | struct rcar_gen2_phy_platform_data { | ||
| 16 | /* USB channel 0 configuration */ | ||
| 17 | bool chan0_pci:1; /* true: PCI USB host 0, false: USBHS */ | ||
| 18 | /* USB channel 2 configuration */ | ||
| 19 | bool chan2_pci:1; /* true: PCI USB host 2, false: USBSS */ | ||
| 20 | }; | ||
| 21 | |||
| 22 | #endif | ||
