Skip to content

L
linux
Commit 0030f654 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files
Options

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

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parents 6e6680e3 7f07863e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
include/linux/platform_data/usb-omap.h
View file @ 0030f654
...@@ -55,13 +55,17 @@ struct ohci_hcd_omap_platform_data { ...@@ -55,13 +55,17 @@ 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% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7