remove queue-3.14/arm-imx6qdl-sabresd-set-swbst_reg-as-vbus-s-parent-reg.patch

diff --git a/queue-3.14/arm-imx6qdl-sabresd-set-swbst_reg-as-vbus-s-parent-reg.patch b/queue-3.14/arm-imx6qdl-sabresd-set-swbst_reg-as-vbus-s-parent-reg.patch
deleted file mode 100644 (file)
index cb202f4..0000000
--- a/queue-3.14/arm-imx6qdl-sabresd-set-swbst_reg-as-vbus-s-parent-reg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 40f737791d4dab26bf23a6331609c604142228bd Mon Sep 17 00:00:00 2001
-From: Peter Chen <peter.chen@freescale.com>
-Date: Fri, 6 Mar 2015 16:04:20 +0800
-Subject: ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
-
-From: Peter Chen <peter.chen@freescale.com>
-
-commit 40f737791d4dab26bf23a6331609c604142228bd 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/imx6qdl-sabresd.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
-@@ -25,6 +25,7 @@
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
-                       enable-active-high;
-+                      vin-supply = <&swbst_reg>;
-               };
- 
-               reg_usb_h1_vbus: usb_h1_vbus {
-@@ -34,6 +35,7 @@
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio1 29 0>;
-                       enable-active-high;
-+                      vin-supply = <&swbst_reg>;
-               };
- 
-               reg_audio: wm8962_supply {

diff --git a/queue-3.14/series b/queue-3.14/series
index 271de7e05493912baf20a9c3046ca2d71a6cbb56..33ae92ac5b6a0eccd318ea8ecf4026947f553fbc 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -66,7 +66,6 @@ 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-imx6qdl-sabresd-set-swbst_reg-as-vbus-s-parent-reg.patch
 arm-at91-pm-fix-at91rm9200-standby.patch
 arm-dts-dra7x-fix-the-bypass-clock-source-for-dpll_iva-and-others.patch
 target-fix-reference-leak-in-target_get_sess_cmd-error-path.patch