diff options
| author | Steve Lin <stlin@nvidia.com> | 2011-10-12 19:19:02 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:34 -0800 |
| commit | 1c2ac43bf1609a24d83f8d736c9c0384efe66dfd (patch) | |
| tree | d7e9582ff6baaa1d359c87dc18de39839cbfdef7 /drivers/usb/host | |
| parent | a486eeced544d37726afbd3e071498f7cd1aaff6 (diff) | |
usb: ehci: tegra: Recovering 2LS WAR for non-UTMIP
Recovering 2LS SOF edge WAR for link-ULPI, null-ULPI and HSIC.
Bug 845989
Reviewed-on: http://git-master/r/57721
(cherry picked from commit ffa6f9b861b424c3c7d2042d1dbc8683cbc924ff)
Change-Id: Ib4b583b8a03f87063103e10a117eee00f8f14cea
Reviewed-on: http://git-master/r/60320
Reviewed-by: Sheshagiri Shenoy <sshenoy@nvidia.com>
Reviewed-by: Steve Lin <stlin@nvidia.com>
Tested-by: Steve Lin <stlin@nvidia.com>
Rebase-Id: R9e887cc6c11f953a6e0fa37ee524ba3dda4a8cf4
Diffstat (limited to 'drivers/usb/host')
| -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 19383e3fd3a8..1df169df3602 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -214,9 +214,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; @@ -323,7 +322,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); @@ -344,6 +345,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 */ |