summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c36
1 files changed, 20 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index 458053d56fcd..6dc9b906a3af 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -881,6 +881,8 @@ static int __init cardhu_touch_init(void)
return 0;
}
+#if defined(CONFIG_USB_SUPPORT)
+
static void cardu_usb_hsic_postsupend(void)
{
#ifdef CONFIG_TEGRA_BB_XMM_POWER
@@ -936,7 +938,7 @@ static struct tegra_usb_platform_data tegra_ehci2_hsic_xmm_pdata = {
},
.ops = &hsic_xmm_plat_ops,
};
-
+#endif
static int hsic_enable_gpio = -1;
static int hsic_reset_gpio = -1;
@@ -998,6 +1000,7 @@ void hsic_power_off(void)
}
}
+#if defined(CONFIG_USB_SUPPORT)
static struct tegra_usb_phy_platform_ops hsic_plat_ops = {
.open = hsic_platform_open,
.close = hsic_platform_close,
@@ -1050,15 +1053,14 @@ static struct tegra_usb_platform_data tegra_udc_pdata = {
},
};
-static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
- .port_otg = true,
+static struct tegra_usb_platform_data tegra_ehci2_utmi_pdata = {
+ .port_otg = false,
.has_hostpc = true,
.phy_intf = TEGRA_USB_PHY_INTF_UTMI,
- .op_mode = TEGRA_USB_OPMODE_HOST,
+ .op_mode = TEGRA_USB_OPMODE_HOST,
.u_data.host = {
.vbus_gpio = -1,
- .vbus_reg = "vdd_vbus_micro_usb",
- .hot_plug = true,
+ .hot_plug = false,
.remote_wakeup_supported = true,
.power_off_on_suspend = true,
},
@@ -1075,14 +1077,15 @@ static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
},
};
-static struct tegra_usb_platform_data tegra_ehci2_utmi_pdata = {
+static struct tegra_usb_platform_data tegra_ehci3_utmi_pdata = {
.port_otg = false,
.has_hostpc = true,
.phy_intf = TEGRA_USB_PHY_INTF_UTMI,
- .op_mode = TEGRA_USB_OPMODE_HOST,
+ .op_mode = TEGRA_USB_OPMODE_HOST,
.u_data.host = {
.vbus_gpio = -1,
- .hot_plug = false,
+ .vbus_reg = "vdd_vbus_typea_usb",
+ .hot_plug = true,
.remote_wakeup_supported = true,
.power_off_on_suspend = true,
},
@@ -1091,7 +1094,7 @@ static struct tegra_usb_platform_data tegra_ehci2_utmi_pdata = {
.elastic_limit = 16,
.idle_wait_delay = 17,
.term_range_adj = 6,
- .xcvr_setup = 15,
+ .xcvr_setup = 8,
.xcvr_lsfslew = 2,
.xcvr_lsrslew = 2,
.xcvr_setup_offset = 0,
@@ -1099,14 +1102,14 @@ static struct tegra_usb_platform_data tegra_ehci2_utmi_pdata = {
},
};
-static struct tegra_usb_platform_data tegra_ehci3_utmi_pdata = {
- .port_otg = false,
+static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
+ .port_otg = true,
.has_hostpc = true,
.phy_intf = TEGRA_USB_PHY_INTF_UTMI,
- .op_mode = TEGRA_USB_OPMODE_HOST,
+ .op_mode = TEGRA_USB_OPMODE_HOST,
.u_data.host = {
.vbus_gpio = -1,
- .vbus_reg = "vdd_vbus_typea_usb",
+ .vbus_reg = "vdd_vbus_micro_usb",
.hot_plug = true,
.remote_wakeup_supported = true,
.power_off_on_suspend = true,
@@ -1116,7 +1119,7 @@ static struct tegra_usb_platform_data tegra_ehci3_utmi_pdata = {
.elastic_limit = 16,
.idle_wait_delay = 17,
.term_range_adj = 6,
- .xcvr_setup = 8,
+ .xcvr_setup = 15,
.xcvr_lsfslew = 2,
.xcvr_lsrslew = 2,
.xcvr_setup_offset = 0,
@@ -1128,8 +1131,9 @@ static struct tegra_usb_otg_data tegra_otg_pdata = {
.ehci_device = &tegra_ehci1_device,
.ehci_pdata = &tegra_ehci1_utmi_pdata,
};
+#endif
-#if CONFIG_USB_SUPPORT
+#if defined(CONFIG_USB_SUPPORT)
static void cardhu_usb_init(void)
{
struct board_info bi;