ARM: dts: kirkwood: set default pinctrl for SPI0

Most Kirkwood boards use the default SPI0 pinctrl setting anyway. Add a
default pinctrl setting to the toplevel SoC SPI0 node and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level.

Currently, only T5325 is using a different setting and already
overwrites the corresponding pinctrl node.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-11-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 38972b2210892f81633e6586152456b2b5e624b1..6678e0b318d53181e8276235a6f5191c685a65da 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -70,8 +70,6 @@ pmx_beeper: pmx-beeper {
 
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p16@0 {
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 1ac6bd9f54de97e695aea201484d58284b155a9f..e7a232eb28b06149e16d3ab9f3159c7b2dbf6427 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -37,8 +37,6 @@ sata@80000 {
                };
 
                spi@10600 {
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        flash@0 {

diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index dd8d1a4611a8f0782ad9d60abe08fa4016c6ab12..af56cecc6c736118ae53bff43e96935cb8f10020 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -38,8 +38,6 @@ serial@12000 {
 
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p40@0 {
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 934f6b8906e323f21d07b440fed797c03b639ceb..343dbb44b3d2699f7232c58229ac1d131d8b4f23 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -50,8 +50,6 @@ pmx_keys: pmx-keys {
                };
 
                spi@10600 {
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        flash@0 {

diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 696b208b676f0612a8c554b55b5f13269d69d94d..c10ff0f5290b0725047fddb90f14ddfafb91ef13 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -24,8 +24,6 @@ serial@12000 {
                };
 
                spi@10600 {
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        flash@0 {

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index 30087b19efae8d1d3184af99aae4015cf3ebd22d..35a29dee8dd864f818c5cacd437a936eb2de0024 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -57,8 +57,6 @@ serial@12000 {
 
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p128@0 {
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 370af7f6931929c1b184715309a0cab617767c48..a21419f78beed0876e84b714944a2a402046199a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -213,8 +213,6 @@ rtc@10300 {
 
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p80@0 {
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index ae102abcab04b0b145d36f3b265b4b7d656e632c..289fc9e2afc246684d4fd30ee3952eaa62e9c336 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -65,10 +65,6 @@ pmx_usb_sata_power_enable: pmx-usb-sata-power-enable {
                                marvell,function = "gpio";
                        };
 
-                       /*
-                        * Redefined from kirkwood-6281.dtsi, because
-                        * we don't use SPI CS on MPP0, but on MPP7.
-                        */
                        pmx_spi: pmx-spi {
                                marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
                                marvell,function = "spi";
@@ -87,8 +83,6 @@ pmx_i2s: pmx-i2s {
                };
 
                spi@10600 {
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        flash@0 {

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 21cb9aeb245518a3099141acdaa7928e75550e8a..539a2f80a3adc8f75939ccdcd115fa981b5887be 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -47,8 +47,6 @@ poweroff@12100 {
                };
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p128@0 {
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index f92c8c4e3908d3aab77fbb3263372adc14f53260..0c8d8fa29926585da2a1fa2482a496a480474a0c 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -88,6 +88,10 @@ pmx_nand: pmx-nand {
                                marvell,function = "nand";
                        };
 
+                       /*
+                        * Default SPI0 pinctrl setting with CSn on mpp0,
+                        * overwrite marvell,pins on board level if required.
+                        */
                        pmx_spi: pmx-spi {
                                marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
                                marvell,function = "spi";
@@ -127,6 +131,8 @@ spi0: spi@10600 {
                        interrupts = <23>;
                        reg = <0x10600 0x28>;
                        clocks = <&gate_clk 7>;
+                       pinctrl-0 = <&pmx_spi>;
+                       pinctrl-names = "default";
                        status = "disabled";
                };