From: Greg Kroah-Hartman Date: Tue, 24 Mar 2015 13:38:34 +0000 (+0100) Subject: 3.19-stable patches X-Git-Tag: v3.19.3~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f24d2792e87218b8454ab6479b42f5083fcab7ff;p=thirdparty%2Fkernel%2Fstable-queue.git 3.19-stable patches added patches: arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch --- diff --git a/queue-3.19/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch b/queue-3.19/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch new file mode 100644 index 00000000000..22314b2be7c --- /dev/null +++ b/queue-3.19/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 +Date: Fri, 6 Mar 2015 16:04:21 +0800 +Subject: ARM: imx6sl-evk: set swbst_reg as vbus's parent reg + +From: Peter Chen + +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 +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -52,6 +52,7 @@ + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 0 0>; + enable-active-high; ++ vin-supply = <&swbst_reg>; + }; + + reg_usb_otg2_vbus: regulator@1 { +@@ -62,6 +63,7 @@ + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 2 0>; + enable-active-high; ++ vin-supply = <&swbst_reg>; + }; + + reg_aud3v: regulator@2 { diff --git a/queue-3.19/series b/queue-3.19/series index 3dcf9f166d8..77d0b011ad5 100644 --- a/queue-3.19/series +++ b/queue-3.19/series @@ -109,3 +109,4 @@ netfilter-nft_compat-fix-module-refcount-underflow.patch netfilter-xt_socket-fix-a-stack-corruption-bug.patch netfilter-nf_tables-fix-transaction-race-condition.patch netfilter-nf_tables-fix-addition-deletion-of-elements-from-commit-abort.patch +arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch