From 669fd3e2c02f561262fb53cfa8c393f643d8487b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Mar 2015 14:38:26 +0100 Subject: [PATCH] 3.14-stable patches added patches: arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch --- ...k-set-swbst_reg-as-vbus-s-parent-reg.patch | 39 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-3.14/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 index 00000000000..bbc7d80814d --- /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 +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 +@@ -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 f948ae530c4..68df65f3219 100644 --- 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 -- 2.47.3