summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-ventana.c
diff options
context:
space:
mode:
authorKurt Yi <kyi@nvidia.com>2012-01-11 21:11:07 +0900
committerVarun Colbert <vcolbert@nvidia.com>2012-01-19 16:25:39 -0800
commitbdd9e97c84f69bab23f5542dc6ac2efa93e53224 (patch)
treef59beafbd80de5e72a5d273a0113eed2d0aafa0b /arch/arm/mach-tegra/board-ventana.c
parent4b9dfedec9ab23b03949407856c03635f31cfa49 (diff)
usb: host: tegra: replace CONFIG_USB_HOTPLUG to tegra_ehci_platform_data
remove CONFIG_USB_HOTPLUG and add default_enable into tegra_ehci_platform_data We can't use different def_config because whistler & ventana source code is merged in same tree. BUG 923705 Change-Id: I3dfdf237d80865831264f02104c89c8088101905 Reviewed-on: http://git-master/r/74574 Signed-off-by: Kurt Yi <kyi@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/75888 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana.c')
-rw-r--r--arch/arm/mach-tegra/board-ventana.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c
index 23f946f643c6..097644021ebc 100644
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@ -174,6 +174,7 @@ static struct tegra_ehci_platform_data ventana_ehci2_ulpi_platform_data = {
.power_down_on_bus_suspend = 1,
.phy_config = &ventana_ehci2_ulpi_phy_config,
.phy_type = TEGRA_USB_PHY_TYPE_LINK_ULPI,
+ .default_enable = true,
};
static struct tegra_i2c_platform_data ventana_i2c1_platform_data = {
@@ -518,18 +519,21 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = {
.phy_config = &utmi_phy_config[0],
.operating_mode = TEGRA_USB_HOST,
.power_down_on_bus_suspend = 1,
+ .default_enable = true,
},
[1] = {
.phy_config = &ulpi_phy_config,
.operating_mode = TEGRA_USB_HOST,
.power_down_on_bus_suspend = 1,
.phy_type = TEGRA_USB_PHY_TYPE_LINK_ULPI,
+ .default_enable = true,
},
[2] = {
.phy_config = &utmi_phy_config[1],
.operating_mode = TEGRA_USB_HOST,
.power_down_on_bus_suspend = 1,
.hotplug = 1,
+ .default_enable = true,
},
};