ARM: Tegra: remove regulator_{disable|enable} from tegra_usb_phy_power_{off|on}
Varun Wadekar [Wed, 11 Jul 2012 13:39:22 +0000 (18:39 +0530)]
Commit ad8b8ae5e (http://git-master/r/105364) added these calls, but it
breaks usb cable hotplug on Ventana.

Change-Id: Ic2e20575f53e851607306496516f55d15997ca27
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

arch/arm/mach-tegra/usb_phy.c

index a420b1a..b567b7f 100644 (file)
@@ -489,17 +489,12 @@ int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)
                }
        }
 
-       if (phy->vdd_reg && phy->vdd_reg_on) {
 #ifndef CONFIG_ARCH_TEGRA_2x_SOC
+       if (phy->vdd_reg && phy->vdd_reg_on) {
                regulator_disable(phy->vdd_reg);
                phy->vdd_reg_on = false;
-#else
-               if (tegra_revision >= TEGRA_REVISION_A03) {
-                       regulator_disable(phy->vdd_reg);
-                       phy->vdd_reg_on = false;
-               }
-#endif
        }
+#endif
 
        phy->phy_power_on = false;
 
@@ -515,10 +510,12 @@ int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
        if (phy->phy_power_on)
                return status;
 
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
        if (phy->vdd_reg && !phy->vdd_reg_on) {
                regulator_enable(phy->vdd_reg);
                phy->vdd_reg_on = true;
        }
+#endif
 
        /* In device mode clock is turned on by pmu irq handler
         * if pmu irq is not available clocks will not be turned off/on