3.14-stable patches

added patches:
	arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch

diff --git a/queue-3.14/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch b/queue-3.14/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch
new file mode 100644 (file)
index 0000000..bbc7d80
--- /dev/null
+++ b/queue-3.14/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch
@@ -0,0 +1,39 @@
+From 2de9dd0391a74e80922c1bc95a78cedf85bcdc9e Mon Sep 17 00:00:00 2001
+From: Peter Chen <peter.chen@freescale.com>
+Date: Fri, 6 Mar 2015 16:04:21 +0800
+Subject: ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
+
+From: Peter Chen <peter.chen@freescale.com>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/imx6sl-evk.dts |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/boot/dts/imx6sl-evk.dts
++++ b/arch/arm/boot/dts/imx6sl-evk.dts
+@@ -28,6 +28,7 @@
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio4 0 0>;
+                       enable-active-high;
++                      vin-supply = <&swbst_reg>;
+               };
+ 
+               reg_usb_otg2_vbus: usb_otg2_vbus {
+@@ -37,6 +38,7 @@
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio4 2 0>;
+                       enable-active-high;
++                      vin-supply = <&swbst_reg>;
+               };
+       };
+ };

diff --git a/queue-3.14/series b/queue-3.14/series
index f948ae530c4fe78c6b4ddb74d7263a0621fd9afa..68df65f321906b05496f84fe4a1c50a1cd81fd01 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -64,3 +64,4 @@ ipvs-add-missing-ip_vs_pe_put-in-sync-code.patch
 ipvs-rerouting-to-local-clients-is-not-needed-anymore.patch
 netfilter-nft_compat-fix-module-refcount-underflow.patch
 netfilter-xt_socket-fix-a-stack-corruption-bug.patch
+arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch