Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / tegra20-seaboard.dts

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index f44a9b8e23bf8c9497bd8b59958ac1db85b8840d..315aae26c3cdb1e2ed84f741e8669cfadf870524 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -566,7 +566,6 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                dr_mode = "otg";
        };
 
@@ -830,6 +829,8 @@
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
                        gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
+                       regulator-always-on;
+                       regulator-boot-on;
                };
        };