projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ab516a)
ARM: dts: kirkwood: consolidate common pinctrl settings
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Wed, 30 Apr 2014 12:56:34 +0000 (14:56 +0200)
committerJason Cooper <jason@lakedaemon.net>
Mon, 5 May 2014 00:52:28 +0000 (00:52 +0000)
All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
and GBE1. Move it to the common pinctrl node that we now have.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-8-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/kirkwood-6192.dtsi patch | blob | history
arch/arm/boot/dts/kirkwood-6281.dtsi patch | blob | history
arch/arm/boot/dts/kirkwood-6282.dtsi patch | blob | history
arch/arm/boot/dts/kirkwood-98dx4122.dtsi patch | blob | history
arch/arm/boot/dts/kirkwood-openblocks_a7.dts patch | blob | history
arch/arm/boot/dts/kirkwood.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index c008e9a877d5f2b2d2da460fd8ccab630a5349d0..dd81508b919b87349b2cc3260f405470e84957d8 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -38,12 +38,6 @@
                pinctrl: pin-controller@10000 {
                        compatible = "marvell,88f6192-pinctrl";
 
-                       pmx_nand: pmx-nand {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
-                                              "mpp4", "mpp5", "mpp18",
-                                              "mpp19";
-                               marvell,function = "nand";
-                       };
                        pmx_sata0: pmx-sata0 {
                                marvell,pins = "mpp5", "mpp21", "mpp23";
                                marvell,function = "sata0";
@@ -52,22 +46,6 @@
                                marvell,pins = "mpp4", "mpp20", "mpp22";
                                marvell,function = "sata1";
                        };
-                       pmx_spi: pmx-spi {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
-                               marvell,function = "spi";
-                       };
-                       pmx_twsi0: pmx-twsi0 {
-                               marvell,pins = "mpp8", "mpp9";
-                               marvell,function = "twsi0";
-                       };
-                       pmx_uart0: pmx-uart0 {
-                               marvell,pins = "mpp10", "mpp11";
-                               marvell,function = "uart0";
-                       };
-                       pmx_uart1: pmx-uart1 {
-                               marvell,pins = "mpp13", "mpp14";
-                               marvell,function = "uart1";
-                       };
                        pmx_sdio: pmx-sdio {
                                marvell,pins = "mpp12", "mpp13", "mpp14",
                                               "mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 3674a9b9552e5eed8c7dd88bd80f7dcda5f31522..7dc7d6782e8325012b8b7ad8fe52676ab15ca404 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -38,12 +38,6 @@
                pinctrl: pin-controller@10000 {
                        compatible = "marvell,88f6281-pinctrl";
 
-                       pmx_nand: pmx-nand {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
-                                              "mpp4", "mpp5", "mpp18",
-                                              "mpp19";
-                               marvell,function = "nand";
-                       };
                        pmx_sata0: pmx-sata0 {
                                marvell,pins = "mpp5", "mpp21", "mpp23";
                                marvell,function = "sata0";
@@ -52,22 +46,6 @@
                                marvell,pins = "mpp4", "mpp20", "mpp22";
                                marvell,function = "sata1";
                        };
-                       pmx_spi: pmx-spi {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
-                               marvell,function = "spi";
-                       };
-                       pmx_twsi0: pmx-twsi0 {
-                               marvell,pins = "mpp8", "mpp9";
-                               marvell,function = "twsi0";
-                       };
-                       pmx_uart0: pmx-uart0 {
-                               marvell,pins = "mpp10", "mpp11";
-                               marvell,function = "uart0";
-                       };
-                       pmx_uart1: pmx-uart1 {
-                               marvell,pins = "mpp13", "mpp14";
-                               marvell,function = "uart1";
-                       };
                        pmx_sdio: pmx-sdio {
                                marvell,pins = "mpp12", "mpp13", "mpp14",
                                               "mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 89a6ba149ec2701b701bcbb96926b5f5e050454e..b869f48cac02dad1adce9b9c41da0876ab03d91f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -59,12 +59,6 @@
                pinctrl: pin-controller@10000 {
                        compatible = "marvell,88f6282-pinctrl";
 
-                       pmx_nand: pmx-nand {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
-                                                       "mpp4", "mpp5", "mpp18", "mpp19";
-                               marvell,function = "nand";
-                       };
-
                        pmx_sata0: pmx-sata0 {
                                marvell,pins = "mpp5", "mpp21", "mpp23";
                                marvell,function = "sata0";
@@ -73,29 +67,12 @@
                                marvell,pins = "mpp4", "mpp20", "mpp22";
                                marvell,function = "sata1";
                        };
-                       pmx_spi: pmx-spi {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
-                               marvell,function = "spi";
-                       };
-                       pmx_twsi0: pmx-twsi0 {
-                               marvell,pins = "mpp8", "mpp9";
-                               marvell,function = "twsi0";
-                       };
 
                        pmx_twsi1: pmx-twsi1 {
                                marvell,pins = "mpp36", "mpp37";
                                marvell,function = "twsi1";
                        };
 
-                       pmx_uart0: pmx-uart0 {
-                               marvell,pins = "mpp10", "mpp11";
-                               marvell,function = "uart0";
-                       };
-
-                       pmx_uart1: pmx-uart1 {
-                               marvell,pins = "mpp13", "mpp14";
-                               marvell,function = "uart1";
-                       };
                        pmx_sdio: pmx-sdio {
                                marvell,pins = "mpp12", "mpp13", "mpp14",
                                               "mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 4a2d1b12d1ca9f72081d62dea651ba9582d0645c..2e8e412b9db0ddb655adf70c4933f58216bffa9c 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -3,28 +3,6 @@
                pinctrl: pin-controller@10000 {
                        compatible = "marvell,98dx4122-pinctrl";
 
-                       pmx_nand: pmx-nand {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
-                                              "mpp4", "mpp5", "mpp18",
-                                              "mpp19";
-                               marvell,function = "nand";
-                       };
-                       pmx_spi: pmx-spi {
-                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
-                               marvell,function = "spi";
-                       };
-                       pmx_twsi0: pmx-twsi0 {
-                               marvell,pins = "mpp8", "mpp9";
-                               marvell,function = "twsi0";
-                       };
-                       pmx_uart0: pmx-uart0 {
-                               marvell,pins = "mpp10", "mpp11";
-                               marvell,function = "uart0";
-                       };
-                       pmx_uart1: pmx-uart1 {
-                               marvell,pins = "mpp13", "mpp14";
-                               marvell,function = "uart1";
-                       };
                };
        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 8c3d50c57fa0f1de30b1da34be879a961f2113e4..1a7f18d5530d5f27347209be755442f7593725cc 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -110,13 +110,6 @@
                                marvell,pins = "mpp41", "mpp42", "mpp43";
                                marvell,function = "gpio";
                        };
-
-                       pmx_ge1: pmx-ge1 {
-                               marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
-                                              "mpp24", "mpp25", "mpp26", "mpp27",
-                                              "mpp30", "mpp31", "mpp32", "mpp33";
-                               marvell,function = "ge1";
-                       };
                };
        };
 
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 028003e1211180c4dd5c9df3eb633145b7e24bc6..5d412e71b9fb89176902b989f18d3564e18cbcfe 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -74,6 +74,39 @@
                pinctrl: pin-controller@10000 {
                        /* set compatible property in SoC file */
                        reg = <0x10000 0x20>;
+
+                       pmx_ge1: pmx-ge1 {
+                               marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
+                                              "mpp24", "mpp25", "mpp26", "mpp27",
+                                              "mpp30", "mpp31", "mpp32", "mpp33";
+                               marvell,function = "ge1";
+                       };
+
+                       pmx_nand: pmx-nand {
+                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+                                              "mpp4", "mpp5", "mpp18", "mpp19";
+                               marvell,function = "nand";
+                       };
+
+                       pmx_spi: pmx-spi {
+                               marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+                               marvell,function = "spi";
+                       };
+
+                       pmx_twsi0: pmx-twsi0 {
+                               marvell,pins = "mpp8", "mpp9";
+                               marvell,function = "twsi0";
+                       };
+
+                       pmx_uart0: pmx-uart0 {
+                               marvell,pins = "mpp10", "mpp11";
+                               marvell,function = "uart0";
+                       };
+
+                       pmx_uart1: pmx-uart1 {
+                               marvell,pins = "mpp13", "mpp14";
+                               marvell,function = "uart1";
+                       };
                };
 
                core_clk: core-clocks@10030 {
ep93xx device tree rework repo: git://git.maquefel.me/linux.git