diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-13 18:27:03 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-13 18:27:14 -0500 |
| commit | 0030f65481338df4213b995a4310e643652acb82 (patch) | |
| tree | 86ea95f2e14e832b6347f0d25fe7d74158595513 /include | |
| parent | 6e6680e3effbf7cff444405a990dbc355dc3a96f (diff) | |
| parent | 7f07863ec60f7d3dbeec5aff881ea074db3925ed (diff) | |
Merge branch 'usbhost17-common' of git://github.com/rogerq/linux into for-next
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/usb-omap.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h index ef65b67c56c3..e697c85ad3bc 100644 --- a/include/linux/platform_data/usb-omap.h +++ b/include/linux/platform_data/usb-omap.h | |||
| @@ -55,13 +55,17 @@ struct ohci_hcd_omap_platform_data { | |||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | struct usbhs_omap_platform_data { | 57 | struct usbhs_omap_platform_data { |
| 58 | enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; | 58 | enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; |
| 59 | int reset_gpio_port[OMAP3_HS_USB_PORTS]; | ||
| 60 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; | ||
| 59 | 61 | ||
| 60 | struct ehci_hcd_omap_platform_data *ehci_data; | 62 | struct ehci_hcd_omap_platform_data *ehci_data; |
| 61 | struct ohci_hcd_omap_platform_data *ohci_data; | 63 | struct ohci_hcd_omap_platform_data *ohci_data; |
| 62 | 64 | ||
| 63 | /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */ | 65 | /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */ |
| 64 | unsigned single_ulpi_bypass:1; | 66 | unsigned single_ulpi_bypass:1; |
| 67 | unsigned es2_compatibility:1; | ||
| 68 | unsigned phy_reset:1; | ||
| 65 | }; | 69 | }; |
| 66 | 70 | ||
| 67 | /*-------------------------------------------------------------------------*/ | 71 | /*-------------------------------------------------------------------------*/ |