diff options
| author | Steve Lin <stlin@nvidia.com> | 2011-10-12 19:19:02 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2011-10-14 18:43:17 -0700 |
| commit | ffa6f9b861b424c3c7d2042d1dbc8683cbc924ff (patch) | |
| tree | 231d35a09946398cd0a2011ca08cb277f44c4771 /drivers | |
| parent | dcf9e85668b87bd92539173f906cc195307c2c11 (diff) | |
usb: ehci: tegra: Recovering 2LS WAR for non-UTMIP
Recovering 2LS SOF edge WAR for link-ULPI, null-ULPI and HSIC.
Bug 845989
Change-Id: I7eb3ccb4369992dbf8b0cb57e213c5bc2691a9c8
Reviewed-on: http://git-master/r/57721
Tested-by: Steve Lin <stlin@nvidia.com>
Tested-by: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index fcce552769ba..4f4b68b50ef9 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -149,9 +149,8 @@ static int tegra_ehci_hub_control( int ports = HCS_N_PORTS(ehci->hcs_params); u32 temp, status; u32 __iomem *status_reg; -#ifdef CONFIG_ARCH_TEGRA_2x_SOC u32 usbsts_reg; -#endif + unsigned long flags; int retval = 0; unsigned selector; @@ -250,7 +249,9 @@ static int tegra_ehci_hub_control( /* Disable disconnect detection during port resume */ tegra_usb_phy_preresume(tegra->phy, false); -#ifdef CONFIG_ARCH_TEGRA_2x_SOC +#ifndef CONFIG_ARCH_TEGRA_2x_SOC + if (tegra->phy->usb_phy_type != TEGRA_USB_PHY_TYPE_UTMIP) { +#endif ehci_dbg(ehci, "%s:USBSTS = 0x%x", __func__, ehci_readl(ehci, &ehci->regs->status)); usbsts_reg = ehci_readl(ehci, &ehci->regs->status); @@ -271,6 +272,8 @@ static int tegra_ehci_hub_control( pr_err("%s: timeout set STS_SRI\n", __func__); udelay(20); +#ifndef CONFIG_ARCH_TEGRA_2x_SOC + } #endif temp &= ~(PORT_RWC_BITS | PORT_WAKE_BITS); /* start resume signaling */ |