diff options
| author | Rakesh Bodla <rbodla@nvidia.com> | 2012-06-07 16:11:20 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-07 18:05:47 -0700 |
| commit | 51457b0dc10527b1b1a28028e3891e81b840b92d (patch) | |
| tree | fc31d0213ec59139b7cf9d3d7d08baf3b44bf387 /arch/arm/mach-tegra/tegra3_usb_phy.c | |
| parent | 4576bb434c78b7a3dcd54ea053173dd75f966ffd (diff) | |
Revert "usb: ehci: tegra: fix hsic enum failure"
This is not merged properly reverting the change.
This reverts commit 3b080222a7b37c31fe73be90c3e681096f8b82dd.
Change-Id: Icb07c67bdff69a41685f7f8b038cf38306566789
Reviewed-on: http://git-master/r/107001
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_usb_phy.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra3_usb_phy.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra3_usb_phy.c b/arch/arm/mach-tegra/tegra3_usb_phy.c index ce2d54beb9b6..8ada255cad55 100644 --- a/arch/arm/mach-tegra/tegra3_usb_phy.c +++ b/arch/arm/mach-tegra/tegra3_usb_phy.c @@ -1925,6 +1925,9 @@ int uhsic_phy_bus_port_power(struct tegra_usb_phy *phy) void __iomem *base = phy->regs; DBG("%s(%d) inst:[%d]\n", __func__, __LINE__, phy->inst); + val = readl(base + UHSIC_STAT_CFG0); + val &= ~UHSIC_CONNECT_DETECT; + writel(val, base + UHSIC_STAT_CFG0); val = readl(base + USB_USBMODE); val |= USB_USBMODE_HOST; @@ -1949,10 +1952,13 @@ int uhsic_phy_bus_port_power(struct tegra_usb_phy *phy) val = readl(base + UHSIC_PADS_CFG1); val &= ~UHSIC_RPD_STROBE; + /* safe to enable RPU on STROBE at all times during idle */ + val |= UHSIC_RPU_STROBE; writel(val, base + UHSIC_PADS_CFG1); - if (phy->pdata->ops && phy->pdata->ops->port_power) - phy->pdata->ops->port_power(); + val = readl(base + USB_USBCMD); + val &= ~USB_USBCMD_RS; + writel(val, base + USB_USBCMD); if (usb_phy_reg_status_wait(base + UHSIC_STAT_CFG0, UHSIC_CONNECT_DETECT, UHSIC_CONNECT_DETECT, 25000)) { |