From dcb5e52209e52b6004b5888d41620386a28d2567 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 8 Jul 2019 14:54:13 +0200
Subject: [PATCH] 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>
---
.../lantiq/files/arch/mips/boot/dts/ARV4510PW.dts | 6 ------
.../lantiq/files/arch/mips/boot/dts/EASY50712.dts | 9 ---------
.../lantiq/files/arch/mips/boot/dts/EASY50810.dts | 9 ---------
.../lantiq/files/arch/mips/boot/dts/EASY80920.dtsi | 7 +------
.../lantiq/files/arch/mips/boot/dts/GIGASX76X.dts | 12 ------------
.../lantiq/files/arch/mips/boot/dts/P2601HNFX.dts | 12 ------------
.../lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi | 7 -------
.../lantiq/files/arch/mips/boot/dts/VGV7519.dtsi | 7 -------
.../linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi | 12 ++++++++++++
.../lantiq/files/arch/mips/boot/dts/danube.dtsi | 12 ++++++++++++
.../linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi | 11 +++++++++++
11 files changed, 36 insertions(+), 68 deletions(-)
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 e15eb66b049..a61972518ec 100644
--- 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 ba7f302c2ef..74318a5f65c 100644
--- 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 4f101151d19..492dbac98e7 100644
--- 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 33c8dd19f7e..37ba1c0c9a4 100644
--- 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 a9a5cbae2fc..0072f7e2b16 100644
--- 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 c238826932e..c31945fff09 100644
--- 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 f22dc912dec..d6879009dbb 100644
--- 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 f9e60774cbc..e82407d7c3c 100644
--- 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 da56485214f..a613131e480 100644
--- 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 eec7a5d0543..795df712e2a 100644
--- 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 2cb34eab010..fa8d2fae63f 100644
--- 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>;
--
GitLab