ARM: tegra: acer-a500: Remove bogus USB VBUS regulators

The configuration of USB VBUS regulators was borrowed from downstream
kernel, which is incorrect because the corresponding GPIOs are connected
to PROX_EN (A501 3G model) and LED_EN pins in accordance to the board
schematics. USB works fine with both GPIOs being disabled, so remove the
bogus USB VBUS regulators. The USB VBUS of USB3 is supplied from the fixed
5v system regulator and device-mode USB1 doesn't have VBUS switches.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
index 4897079680bd3e4d64bb41b6e41058fca2d57d4c..c385b13d4faa2c2bdfaa488386209dfc4c49d020 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -723,7 +723,6 @@
                nvidia,xcvr-setup-use-fuses;
                nvidia,xcvr-lsfslew = <2>;
                nvidia,xcvr-lsrslew = <2>;
-               vbus-supply = <&vdd_vbus1>;
        };
 
        usb@c5008000 {
@@ -735,7 +734,7 @@
                nvidia,xcvr-setup-use-fuses;
                nvidia,xcvr-lsfslew = <2>;
                nvidia,xcvr-lsrslew = <2>;
-               vbus-supply = <&vdd_vbus3>;
+               vbus-supply = <&vdd_5v0_sys>;
        };
 
        brcm_wifi_pwrseq: wifi-pwrseq {
@@ -995,28 +994,6 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_vbus1: regulator@4 {
-               compatible = "regulator-fixed";
-               regulator-name = "vdd_usb1_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               vin-supply = <&vdd_5v0_sys>;
-       };
-
-       vdd_vbus3: regulator@5 {
-               compatible = "regulator-fixed";
-               regulator-name = "vdd_usb3_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               gpio = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               vin-supply = <&vdd_5v0_sys>;
-       };
-
        sound {
                compatible = "nvidia,tegra-audio-wm8903-picasso",
                             "nvidia,tegra-audio-wm8903";