diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-03 15:15:10 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-03 15:15:10 -0500 |
| commit | 73ad0adcb69d6a895ff73855ab366a7ae0b2fb0b (patch) | |
| tree | a66967eb3fe9b6162820c93b5c56221d90c291c8 /include/linux/platform_data/usb-omap1.h | |
| parent | 99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198 (diff) | |
| parent | 836a2164491b19dcd4f29d574e548bcadd421a6a (diff) | |
Merge tag 'usb-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: changes for v3.14 merge window
This pull request is quite extensive, containing
105 non-merge commits. Because of that, we describe
the changes in sections below:
New drivers:
- Keystone PHY driver and DWC3 Glue Layer
- Aeroflex Gaisler GRUSBDC
- Tahvo PHY driver for N770
- JZ4740 MUSB gluer Layer
- Broadcom PHY Driver
Important new features:
- MUSB DSPS learned about suspend/resume
- New quirk_ep_out_aligned_size flag added to struct usb_gadget
- DWC3 initializes the new quirk flag so gadget drivers can use it.
- AM335x PHY Driver learns about remote wakeup
- Renesas USBHS now requests DMA Engine only once
- s3c-hsotg is now re-used on Broadcom devices
- USB PHY layer now makes sure to initialize the notifier for all
drivers
- omap-control learned about TI's new AM437x devices
- few other usb gadget/function drivers learned about the new
configfs-based binding.
Misc Fixes and Clean Ups:
- Several sparse fixes all over the place
- Removal of redundant of_match_ptr()
- r-car gen2 phy now uses usb_add_phy_dev()
- removal of DEFINE_PCI_DEVICE_TABLE() from a few drivers
- conversion to clk_prepare/clk_unprepare on r8a66597-udc
- some randconfig errors and build warnings were fixed
- removal of unnecessary lock on dwc3-omap.c
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/platform_data/usb-omap1.h')
| -rw-r--r-- | include/linux/platform_data/usb-omap1.h | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/include/linux/platform_data/usb-omap1.h b/include/linux/platform_data/usb-omap1.h new file mode 100644 index 000000000000..43b5ce139c37 --- /dev/null +++ b/include/linux/platform_data/usb-omap1.h | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | /* | ||
| 2 | * Platform data for OMAP1 USB | ||
| 3 | * | ||
| 4 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 5 | * License. See the file "COPYING" in the main directory of this archive for | ||
| 6 | * more details. | ||
| 7 | */ | ||
| 8 | #ifndef __LINUX_USB_OMAP1_H | ||
| 9 | #define __LINUX_USB_OMAP1_H | ||
| 10 | |||
| 11 | #include <linux/platform_device.h> | ||
| 12 | |||
| 13 | struct omap_usb_config { | ||
| 14 | /* Configure drivers according to the connectors on your board: | ||
| 15 | * - "A" connector (rectagular) | ||
| 16 | * ... for host/OHCI use, set "register_host". | ||
| 17 | * - "B" connector (squarish) or "Mini-B" | ||
| 18 | * ... for device/gadget use, set "register_dev". | ||
| 19 | * - "Mini-AB" connector (very similar to Mini-B) | ||
| 20 | * ... for OTG use as device OR host, initialize "otg" | ||
| 21 | */ | ||
| 22 | unsigned register_host:1; | ||
| 23 | unsigned register_dev:1; | ||
| 24 | u8 otg; /* port number, 1-based: usb1 == 2 */ | ||
| 25 | |||
| 26 | const char *extcon; /* extcon device for OTG */ | ||
| 27 | |||
| 28 | u8 hmc_mode; | ||
| 29 | |||
| 30 | /* implicitly true if otg: host supports remote wakeup? */ | ||
| 31 | u8 rwc; | ||
| 32 | |||
| 33 | /* signaling pins used to talk to transceiver on usbN: | ||
| 34 | * 0 == usbN unused | ||
| 35 | * 2 == usb0-only, using internal transceiver | ||
| 36 | * 3 == 3 wire bidirectional | ||
| 37 | * 4 == 4 wire bidirectional | ||
| 38 | * 6 == 6 wire unidirectional (or TLL) | ||
| 39 | */ | ||
| 40 | u8 pins[3]; | ||
| 41 | |||
| 42 | struct platform_device *udc_device; | ||
| 43 | struct platform_device *ohci_device; | ||
| 44 | struct platform_device *otg_device; | ||
| 45 | |||
| 46 | u32 (*usb0_init)(unsigned nwires, unsigned is_device); | ||
| 47 | u32 (*usb1_init)(unsigned nwires); | ||
| 48 | u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup); | ||
| 49 | |||
| 50 | int (*ocpi_enable)(void); | ||
| 51 | }; | ||
| 52 | |||
| 53 | #endif /* __LINUX_USB_OMAP1_H */ | ||
