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 (file)
index bbc7d80..0000000
--- 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 <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 33ae92ac5b6a0eccd318ea8ecf4026947f553fbc..9d8c4ff088aec97231de6de8bcdd3db4ac7b5940 100644 (file)
--- 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