From: Peter Chen <peter.chen@freescale.com>
Date: Fri, 6 Mar 2015 08:04:21 +0000 (+0800)
Subject: ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
X-Git-Tag: v3.16.35~2523
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=410ac5d8efd681993aa8a46daf8cf563509e2577;p=thirdparty%2Fkernel%2Fstable.git

ARM: imx6sl-evk: set swbst_reg as vbus's parent reg

commit 2de9dd0391a74e80922c1bc95a78cedf85bcdc9e upstream.

USB vbus 5V is from PMIC SWBST, so set swbst_reg as vbus's
parent reg, it fixed a bug that the voltage of vbus is incorrect
due to swbst_reg is disabled after boots up.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index a8d9a93fab85f..fc4a265a26ac8 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -45,6 +45,7 @@
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio4 0 0>;
 			enable-active-high;
+			vin-supply = <&swbst_reg>;
 		};
 
 		reg_usb_otg2_vbus: regulator@1 {
@@ -55,6 +56,7 @@
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio4 2 0>;
 			enable-active-high;
+			vin-supply = <&swbst_reg>;
 		};
 
 		reg_aud3v: regulator@2 {