提交 0030f654 编写于 作者: S Samuel Ortiz

Merge branch 'usbhost17-common' of git://github.com/rogerq/linux into for-next

Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
...@@ -56,12 +56,16 @@ struct ohci_hcd_omap_platform_data { ...@@ -56,12 +56,16 @@ struct ohci_hcd_omap_platform_data {
struct usbhs_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 ehci_hcd_omap_platform_data *ehci_data;
struct ohci_hcd_omap_platform_data *ohci_data; struct ohci_hcd_omap_platform_data *ohci_data;
/* OMAP3 <= ES2.1 have a single ulpi bypass control bit */ /* 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;
}; };
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册