lantiq: dts: assign the STP pins to the STP GPIO controller node

Assign the STP pins to the STP GPIO controller node instead of using
pin hogging (where pins are assigned to the pin controller).
This is the preferred way of assigning pins upstream.

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

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
index e15eb66b04943391e397f5775c132a6fc5aab766..a61972518ec90c125fae13c10d17381e60c0fcda 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
@@ -131,12 +131,6 @@
                        lantiq,open-drain = <0>;
                        lantiq,output = <1>;
                };
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-                       lantiq,open-drain = <0>;
-                       lantiq,output = <1>;
-               };
                exin {
                        lantiq,groups = "exin1", "exin2";
                        lantiq,function = "exin";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
index ba7f302c2efb8f273bebd1653be3028c93fdb81b..74318a5f65c84cf777472ac60c094ae2af489739 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
@@ -21,10 +21,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-               };
                exin {
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
@@ -33,11 +29,6 @@
                        lantiq,groups = "gnt1";
                        lantiq,function = "pci";
                };
-               conf_out {
-                       lantiq,pins = "io4", "io5", "io6"; /* stp */
-                       lantiq,open-drain;
-                       lantiq,pull = <0>;
-               };
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
index 4f101151d1926787a939b62fae52422cb5c81db5..492dbac98e7bc3b648bafd80da17b7fc234b93a8 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
@@ -21,10 +21,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-               };
                exin {
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
@@ -33,11 +29,6 @@
                        lantiq,groups = "gnt1";
                        lantiq,function = "pci";
                };
-               conf_out {
-                       lantiq,pins = "io4", "io5", "io6"; /* stp */
-                       lantiq,open-drain;
-                       lantiq,pull = <0>;
-               };
        };
 };
 

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 33c8dd19f7eda32aae2a501ae1467c3df4d3d3ab..37ba1c0c9a4e1336a91ad4b937825e53674b6c2e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
@@ -189,17 +189,12 @@
                        lantiq,groups = "exin3";
                        lantiq,function = "exin";
                };
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-               };
                pci {
                        lantiq,groups = "gnt1", "req1";
                        lantiq,function = "pci";
                };
                conf_out {
-                       lantiq,pins = "io4", "io5", "io6", /* stp */
-                                       "io21",
+                       lantiq,pins = "io21",
                                        "io33";
                        lantiq,open-drain;
                        lantiq,pull = <0>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
index a9a5cbae2fc38494e33f0931d4f31e8746d522b9..0072f7e2b16c24ea1b2a3f6b2fe664ae2e302e4c 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
@@ -52,18 +52,6 @@
        };
 };
 
-&gpio {
-       pinctrl-names = "default";
-       pinctrl-0 = <&state_default>;
-
-       state_default: pinmux {
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-               };
-       };
-};
-
 &gpios {
        status = "okay";
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
index c238826932efacec4c56c9295b72826f17331470..c31945fff092bc79ff9828205b65610187f1b504 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
@@ -103,13 +103,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-                       lantiq,pull = <2>;
-                       lantiq,open-drain = <0>;
-                       lantiq,output = <1>;
-               };
                exin {
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
@@ -118,11 +111,6 @@
                        lantiq,groups = "gnt1";
                        lantiq,function = "pci";
                };
-               conf_out {
-                       lantiq,pins = "io4", "io5", "io6";
-                       lantiq,open-drain;
-                       lantiq,pull = <0>;
-               };
        };
 
        usb_vbus: regulator-usb-vbus {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
index f22dc912decb7a87cecccf50b8ada05e13c82362..d6879009dbb83a6c79ce4fac81283c94b13bba26 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -201,13 +201,6 @@
                        lantiq,groups = "exin3";
                        lantiq,function = "exin";
                };
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-                       lantiq,pull = <2>;
-                       lantiq,open-drain = <0>;
-                       lantiq,output = <1>;
-               };
                pci-in {
                        lantiq,groups = "req1";
                        lantiq,function = "pci";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
index f9e60774cbcf3aeafd75c7c87016fe94e5e8c42d..e82407d7c3c34dfc2ae5f75d65d3f600d82507d9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
@@ -212,13 +212,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               stp {
-                       lantiq,groups = "stp";
-                       lantiq,function = "stp";
-                       lantiq,open-drain = <0>;
-                       lantiq,output = <1>;
-                       lantiq,pull = <0>;
-               };
                pci-rst {
                        lantiq,pins = "io21";
                        lantiq,open-drain = <0>;

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 da56485214f76e19c45a187c50bd3edac295ef43..a613131e48046e26412e109427c2bc3326520574 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
@@ -223,6 +223,14 @@
                                        lantiq,output = <1>;
                                };
                        };
+
+                       stp_pins: stp {
+                               lantiq,groups = "stp";
+                               lantiq,function = "stp";
+                               lantiq,pull = <0>;
+                               lantiq,open-drain = <0>;
+                               lantiq,output = <1>;
+                       };
                };
 
                stp: stp@e100bb0 {
@@ -230,6 +238,10 @@
                        compatible = "lantiq,gpio-stp-xway";
                        gpio-controller;
                        reg = <0xe100bb0 0x40>;
+
+                       pinctrl-0 = <&stp_pins>;
+                       pinctrl-names = "default";
+
                        status = "disabled";
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
index eec7a5d05432e957d97652ffb6546b0a2e993a15..795df712e2adf9d3987d7c3b52dafd2bcc905075 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
@@ -144,6 +144,10 @@
                        compatible = "lantiq,gpio-stp-xway";
                        gpio-controller;
                        reg = <0xe100bb0 0x40>;
+
+                       pinctrl-0 = <&stp_pins>;
+                       pinctrl-names = "default";
+
                        lantiq,shadow = <0xfff>;
                        lantiq,groups = <0x3>;
                        status = "disabled";
@@ -188,6 +192,14 @@
                                        lantiq,pull = <0>;
                                };
                        };
+
+                       stp_pins: stp {
+                               lantiq,groups = "stp";
+                               lantiq,function = "stp";
+                               lantiq,pull = <0>;
+                               lantiq,open-drain = <0>;
+                               lantiq,output = <1>;
+                       };
                };
 
                asc1: serial@e100c00 {

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 2cb34eab010fd1994ebf836a66e83fd71d93a52e..fa8d2fae63fb46a985f4d00b89db9a65788408a7 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
@@ -313,6 +313,14 @@
                                        lantiq,output = <1>;
                                };
                        };
+
+                       stp_pins: stp {
+                               lantiq,groups = "stp";
+                               lantiq,function = "stp";
+                               lantiq,pull = <0>;
+                               lantiq,open-drain = <0>;
+                               lantiq,output = <1>;
+                       };
                };
 
                stp: stp@e100bb0 {
@@ -322,6 +330,9 @@
                        #gpio-cells = <2>;
                        gpio-controller;
 
+                       pinctrl-0 = <&stp_pins>;
+                       pinctrl-names = "default";
+
                        lantiq,shadow = <0xffffff>;
                        lantiq,groups = <0x7>;
                        lantiq,dsl = <0x0>;