lantiq: dts: define the SPI pins in {amazonse,ar9,vr9}.dtsi

Define the SPI pins in the corresponding SoCs.dtsi and assign them to
the SPI controller node. All known boards use CS4 and it's likely that
this is hardcoded in bootrom so this doesn't bother with having
per-board SPI pinmux settings.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
index b4eee73b739ba1979e0b35d7b4326643c928ae39..0143a21a9cd99c29fbe1eb3a748a45c96cde14b1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
@@ -96,18 +96,6 @@
                        lantiq,open-drain = <1>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs1";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &gsw {
@@ -117,8 +105,6 @@
 
 &spi {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
 
        flash@1 {
                compatible = "jedec,spi-nor";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
index 4a20dcefd32fdae07c6e84d04e08bad5b64175c1..b12101a5d12aefca25f78d52787d6b455c4407c6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
@@ -131,18 +131,6 @@
                        lantiq,pull = <0>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &gsw {
@@ -163,9 +151,6 @@
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
index 362dccfda7f358a5c71ecdd8cfbf18ca4369eaea..cdba656e49fdd1aedbbf123f8731cd34c82bcf01 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
@@ -118,20 +118,6 @@
        lantiq,gphy-mode = <GPHY_MODE_FE>;
 };
 
-&gpio {
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk", "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
-};
-
 &pcie0 {
        status = "disabled";
 };
@@ -139,9 +125,6 @@
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
index d09a9626bb6b495dbf3377722c7561db3e77c31f..687a2f409892742c5bb7e1db7a334d7d822d33fa 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
@@ -222,24 +222,9 @@
                        lantiq,pull = <2>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &spi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        status = "okay";
 
        flash@4 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
index 6790815a24ec8eb13cb10194eb16aa02e5db0191..b83f0f058a31e5c4eff35d474df73884a549fb07 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
@@ -213,20 +213,6 @@
                        lantiq,output = <1>;
                };
        };
-
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &pcie0 {
@@ -250,9 +236,6 @@
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
index cca79c926eb0f33c7c28e9e042cc4be13c79678e..8f1fc261fbea6d4cdcedf0330159fc29f02723b4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
@@ -35,22 +35,6 @@
        label = "fritz7362sl:green:dect";
 };
 
-&gpio {
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
-};
-
 &state_default {
        nand {
                lantiq,groups = "nand ale", "nand cle",
@@ -67,8 +51,6 @@
 
 &spi {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
 
        flash@4 {
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
index 00475e734e07f17c45f9c2ad359bf2d9c7008f14..d0e8cd8ced2b7a39a8adfab24a65dd576ba53439 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
@@ -194,18 +194,6 @@
                        lantiq,output = <1>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &pcie0 {
@@ -232,9 +220,6 @@
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
index 7fedcee92f5cb73a2d9dd9dd27e84ba5c49230a5..44938eddd3420e6e0ef86dbdd52a12fdfa9c2911 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
@@ -114,18 +114,6 @@
                        lantiq,output = <1>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &pci0 {
@@ -136,9 +124,6 @@
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
index 7e5f58c71e01cce6943524bbb27d3b604090ab69..4631ad4ffe0ec3b94ba54ae813568c2d878ac0dc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
@@ -237,26 +237,11 @@
                        lantiq,output = <1>;
                };
        };
-       pins_spi_default: pins_spi_default {
-               spi_in {
-                       lantiq,groups = "spi_di";
-                       lantiq,function = "spi";
-               };
-               spi_out {
-                       lantiq,groups = "spi_do", "spi_clk",
-                               "spi_cs4";
-                       lantiq,function = "spi";
-                       lantiq,output = <1>;
-               };
-       };
 };
 
 &spi {
        status = "okay";
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
        flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
index 33dc5612bf6d1870d868126ad0b2f16ff2f75ce3..6b5606d8ab3d605c8b27ca365fbe10812a979177 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
@@ -133,6 +133,8 @@
                                        "spi_frm";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>;
                        status = "disabled";
                };
 
@@ -155,6 +157,26 @@
                                        lantiq,function = "mdio";
                                };
                        };
+
+                       spi_pins: spi {
+                               mux-0 {
+                                       lantiq,groups = "spi_di";
+                                       lantiq,function = "spi";
+                               };
+                               mux-1 {
+                                       lantiq,groups = "spi_do", "spi_clk";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
+
+                       spi_cs4_pins: spi-cs4 {
+                               mux {
+                                       lantiq,groups = "spi_cs4";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
                };
 
                asc1: serial@e100c00 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
index 3244908e323ef6bbf2023b19471f69b97d9723f7..ab518e75c6e0824f31eea36268a80c1a02224583 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
@@ -160,6 +160,8 @@
                                        "spi_frm";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>;
                        status = "disabled";
                };
 
@@ -175,6 +177,26 @@
                                        lantiq,function = "mdio";
                                };
                        };
+
+                       spi_pins: spi {
+                               mux-0 {
+                                       lantiq,groups = "spi_di";
+                                       lantiq,function = "spi";
+                               };
+                               mux-1 {
+                                       lantiq,groups = "spi_do", "spi_clk";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
+
+                       spi_cs4_pins: spi-cs4 {
+                               mux {
+                                       lantiq,groups = "spi_cs4";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
                };
 
                stp: stp@e100bb0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
index 81e2fea54943ad4619b50dbc7214c63e628a467e..4639aaf490304071542d7c0820a7eb2efe1d1340 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
@@ -202,6 +202,8 @@
                                        "spi_frm";
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>;
                        status = "disabled";
                };
 
@@ -217,6 +219,26 @@
                                        lantiq,function = "mdio";
                                };
                        };
+
+                       spi_pins: spi {
+                               mux-0 {
+                                       lantiq,groups = "spi_di";
+                                       lantiq,function = "spi";
+                               };
+                               mux-1 {
+                                       lantiq,groups = "spi_do", "spi_clk";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
+
+                       spi_cs4_pins: spi-cs4 {
+                               mux {
+                                       lantiq,groups = "spi_cs4";
+                                       lantiq,function = "spi";
+                                       lantiq,output = <1>;
+                               };
+                       };
                };
 
                stp: stp@e100bb0 {