ARM: tegra: phy:remove turning off PMC pad detector

Remove the turning off the PMC pad detector
for USB port 3. This is not needed and it is
overriding the neccessary values which are
already programmed.

Bug 1181571

Reviewed-on: http://git-master/r/173612
(cherry picked from commit 7a21472fe2306b89b5dd3adfd0e618d3a9fdb6f0)

Change-Id: I54c78ca5e057203e1940c7dd506827b632efd4d8
Signed-off-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-on: http://git-master/r/174382
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c
index 86844ea65e36103abfd46bb1a4396fd9a94155b9..c2487ba24d76ad6d717f769920e1f739d3be2e5b 100644 (file)
--- a/arch/arm/mach-tegra/tegra11x_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c
@@ -360,7 +360,6 @@
 #define   USBOP_VAL_PD_P2                      (1 << 8)
 #define   USBOP_VAL_PD_P1                      (1 << 4)
 #define   USBOP_VAL_PD_P0                      (1 << 0)
-#define   PMC_USB_AO_PD_P2                     (0xf << 8)
 #define   PMC_USB_AO_ID_PD_P0                  (1 << 3)
 #define   PMC_USB_AO_VBUS_WAKEUP_PD_P0 (1 << 2)
 
@@ -1196,7 +1195,7 @@ static int utmi_phy_open(struct tegra_usb_phy *phy)
                val |= PMC_USB_AO_ID_PD_P0;
        else
                val &= ~PMC_USB_AO_ID_PD_P0;
-       writel((val | PMC_USB_AO_PD_P2), (pmc_base + PMC_USB_AO));
+       writel(val, (pmc_base + PMC_USB_AO));
 
        utmip_powerup_pmc_wake_detect(phy);
 

diff --git a/arch/arm/mach-tegra/tegra3_usb_phy.c b/arch/arm/mach-tegra/tegra3_usb_phy.c
index c264c036239c63738d79163c5d87b954580e7959..db5f23cf6e68f017d979d361bd816d6d0f3729a0 100644 (file)
--- a/arch/arm/mach-tegra/tegra3_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra3_usb_phy.c
@@ -286,7 +286,6 @@
 #define   USBOP_VAL_PD_P2                      (1 << 8)
 #define   USBOP_VAL_PD_P1                      (1 << 4)
 #define   USBOP_VAL_PD_P0                      (1 << 0)
-#define   PMC_USB_AO_PD_P2                     (0xf << 8)
 #define   PMC_USB_AO_ID_PD_P0                  (1 << 3)
 #define   PMC_USB_AO_VBUS_WAKEUP_PD_P0 (1 << 2)
 
@@ -1145,7 +1144,7 @@ static int utmi_phy_open(struct tegra_usb_phy *phy)
        /* Power-up the VBUS detector for UTMIP PHY */
        val = readl(pmc_base + PMC_USB_AO);
        val &= ~(PMC_USB_AO_VBUS_WAKEUP_PD_P0 | PMC_USB_AO_ID_PD_P0);
-       writel((val | PMC_USB_AO_PD_P2), (pmc_base + PMC_USB_AO));
+       writel(val, (pmc_base + PMC_USB_AO));
 
        utmip_powerup_pmc_wake_detect(phy);