Merge remote-tracking branch 'spi/topic/rspi' into spi-next

[cascardo/linux.git] / arch / arm / boot / dts / tegra20-whistler.dts

diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index ea078ab..a3d0eba 100644 (file)
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -586,7 +586,10 @@
                        regulator-name = "vbus1";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
+                       enable-active-high;
                        gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
+                       regulator-always-on;
+                       regulator-boot-on;
                };
 
                vbus3_reg: regulator@3 {
@@ -595,7 +598,10 @@
                        regulator-name = "vbus3";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
+                       enable-active-high;
                        gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
+                       regulator-always-on;
+                       regulator-boot-on;
                };
        };