From: Greg Kroah-Hartman Date: Thu, 26 Mar 2015 12:58:31 +0000 (+0100) Subject: delete arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch from 3.14 X-Git-Tag: v3.19.3~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16dbc486bab1bf8d20da7c171164c8e4e0517a61;p=thirdparty%2Fkernel%2Fstable-queue.git delete arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch from 3.14 --- 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 deleted file mode 100644 index bbc7d80814d..00000000000 --- a/queue-3.14/arm-imx6sl-evk-set-swbst_reg-as-vbus-s-parent-reg.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 33ae92ac5b6..9d8c4ff088a 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -64,7 +64,6 @@ 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 arm64-honor-__gfp_zero-in-dma-allocations.patch arm-at91-pm-fix-at91rm9200-standby.patch arm-dts-dra7x-fix-the-bypass-clock-source-for-dpll_iva-and-others.patch