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

ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg

commit 40f737791d4dab26bf23a6331609c604142228bd 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/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 40ea36534643c..c3752cdb8b93b 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -35,6 +35,7 @@
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio3 22 0>;
 			enable-active-high;
+			vin-supply = <&swbst_reg>;
 		};
 
 		reg_usb_h1_vbus: regulator@1 {
@@ -45,6 +46,7 @@
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio1 29 0>;
 			enable-active-high;
+			vin-supply = <&swbst_reg>;
 		};
 
 		reg_audio: regulator@2 {