Merge remote-tracking branch 'xfs/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / exynos4210-trats.dts

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index c69e468efd2ec2afb85c2150e0bda94b1fb9b2fe..a50be640f1b03dd0422e6ad8556dcf60b6d5b707 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -252,6 +252,7 @@
 
 &exynos_usbphy {
        status = "okay";
+       vbus-supply = <&safe1_sreg>;
 };
 
 &fimd {
@@ -449,7 +450,6 @@
 
                        safe1_sreg: ESAFEOUT1 {
                             regulator-name = "SAFEOUT1";
-                            regulator-always-on;
                        };
 
                        safe2_sreg: ESAFEOUT2 {