Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next

[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 ab177b406b78053027f8fd512f71975e322c5087..40e6fb280333ec190864a0c3ef55ba6007371ac4 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -828,7 +828,10 @@
                        regulator-name = "vdd_vbus_wup1";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
+                       enable-active-high;
                        gpio = <&gpio 24 0>; /* PD0 */
+                       regulator-always-on;
+                       regulator-boot-on;
                };
        };