diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:27:03 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:27:14 +0100 |
| commit | 0030f65481338df4213b995a4310e643652acb82 (patch) | |
| tree | 86ea95f2e14e832b6347f0d25fe7d74158595513 | |
| parent | 6e6680e3effbf7cff444405a990dbc355dc3a96f (diff) | |
| parent | 7f07863ec60f7d3dbeec5aff881ea074db3925ed (diff) | |
| download | op-kernel-dev-0030f65481338df4213b995a4310e643652acb82.zip op-kernel-dev-0030f65481338df4213b995a4310e643652acb82.tar.gz | |
Merge branch 'usbhost17-common' of git://github.com/rogerq/linux into for-next
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -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 ef65b67..e697c85 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 { }; struct usbhs_omap_platform_data { - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; + enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; + int reset_gpio_port[OMAP3_HS_USB_PORTS]; + struct regulator *regulator[OMAP3_HS_USB_PORTS]; struct ehci_hcd_omap_platform_data *ehci_data; struct ohci_hcd_omap_platform_data *ohci_data; /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */ - unsigned single_ulpi_bypass:1; + unsigned single_ulpi_bypass:1; + unsigned es2_compatibility:1; + unsigned phy_reset:1; }; /*-------------------------------------------------------------------------*/ |
