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

[~andy/linux] / arch / arm / boot / dts / tegra20-trimslice.dts

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 22e227f87e4c19fd3dd9499c45ec25b2a7d7f6d1..78deea5c0d217342979e1940cdaa912f9d53696a 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -322,7 +322,6 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@c5000000 {
@@ -422,6 +421,8 @@
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
                        gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
+                       regulator-always-on;
+                       regulator-boot-on;
                };
 
                pci_clk_reg: regulator@3 {