1 files changed, 0 insertions, 81 deletions
diff --git a/target/linux/mvebu/patches-3.18/008-armada-xp_consolidate_pinctrl_node.patch b/target/linux/mvebu/patches-3.18/008-armada-xp_consolidate_pinctrl_node.patch
deleted file mode 100644
index 2e1010c135..0000000000
--- a/target/linux/mvebu/patches-3.18/008-armada-xp_consolidate_pinctrl_node.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From b324fa60ac94b9c00c59f621743715c036d134fa Mon Sep 17 00:00:00 2001
-From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-Date: Fri, 19 Sep 2014 21:07:09 +0200
-Subject: ARM: mvebu: armada-xp: Consolidate pinctrl node
-
-All current Armada XP SoCs have their pin controller at 0x18000/0x38.
-Move the common properties of pinctrl nodes to armada-xp.dtsi to allow
-to share pinctrl settings later.
-
-Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Tested-By: Benoit Masson <yahoo@perenite.com>
-Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-
---- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
-+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
-@@ -169,13 +169,6 @@
- 		internal-regs {
- 			pinctrl {
- 				compatible = "marvell,mv78230-pinctrl";
--				reg = <0x18000 0x38>;
--
--				sdio_pins: sdio-pins {
--					marvell,pins = "mpp30", "mpp31", "mpp32",
--						       "mpp33", "mpp34", "mpp35";
--					marvell,function = "sd0";
--				};
- 			};
- 
- 			gpio0: gpio@18100 {
---- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
-+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
-@@ -253,13 +253,6 @@
- 		internal-regs {
- 			pinctrl {
- 				compatible = "marvell,mv78260-pinctrl";
--				reg = <0x18000 0x38>;
--
--				sdio_pins: sdio-pins {
--					marvell,pins = "mpp30", "mpp31", "mpp32",
--						       "mpp33", "mpp34", "mpp35";
--					marvell,function = "sd0";
--				};
- 			};
- 
- 			gpio0: gpio@18100 {
---- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
-+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
-@@ -291,13 +291,6 @@
- 		internal-regs {
- 			pinctrl {
- 				compatible = "marvell,mv78460-pinctrl";
--				reg = <0x18000 0x38>;
--
--				sdio_pins: sdio-pins {
--					marvell,pins = "mpp30", "mpp31", "mpp32",
--						       "mpp33", "mpp34", "mpp35";
--					marvell,function = "sd0";
--				};
- 			};
- 
- 			gpio0: gpio@18100 {
---- a/arch/arm/boot/dts/armada-xp.dtsi
-+++ b/arch/arm/boot/dts/armada-xp.dtsi
-@@ -72,6 +72,16 @@
- 				status = "disabled";
- 			};
- 
-+			pinctrl {
-+				reg = <0x18000 0x38>;
-+
-+				sdio_pins: sdio-pins {
-+					marvell,pins = "mpp30", "mpp31", "mpp32",
-+						       "mpp33", "mpp34", "mpp35";
-+					marvell,function = "sd0";
-+				};
-+			};
-+
- 			system-controller@18200 {
- 				compatible = "marvell,armada-370-xp-system-controller";
- 				reg = <0x18200 0x500>;