summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorMichael Hsu <mhsu@nvidia.com>2011-04-26 15:43:37 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-05-03 01:32:27 -0700
commit9793e01b35cdf6b683b36f45177786c42b820fc4 (patch)
tree936d4575d113bf737e1b00fada1131d9a048acb8 /drivers/usb
parent77347c04a1f0ae286c09e5bbf726f5d5746e51e5 (diff)
arm: tegra: hsic: Enable T30 HSIC
Modified cardhu board config for ehci2 to use HSIC. Need to turn on 6416 IO expander gpio for VDDIO_HSIC. Otherwise, VDDIO_HSIC would be 0 Volts. Fix HSIC register differences between T20 / T30. Change-Id: I03079d4691981c8bc5fa220720aa55de507e6f04 Reviewed-on: http://git-master/r/29428 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-tegra.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index a12d8c4ca908..78a20a7552f6 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -201,8 +201,13 @@ static int tegra_ehci_hub_control(
}
/* Handle port reset here */
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
if ((hsic) && (typeReq == SetPortFeature) &&
((wValue == USB_PORT_FEAT_RESET) || (wValue == USB_PORT_FEAT_POWER))) {
+#else
+ if ((hsic) && (typeReq == SetPortFeature) &&
+ (wValue == USB_PORT_FEAT_POWER)) {
+#endif
selector = wIndex >> 8;
wIndex &= 0xff;
if (!wIndex || wIndex > ports) {
@@ -217,6 +222,7 @@ static int tegra_ehci_hub_control(
temp &= ~PORT_RWC_BITS;
switch (wValue) {
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
case USB_PORT_FEAT_RESET:
{
if (temp & PORT_RESUME) {
@@ -247,6 +253,7 @@ static int tegra_ehci_hub_control(
break;
}
+#endif
case USB_PORT_FEAT_POWER:
{
if (HCS_PPC(ehci->hcs_params))