From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 8 Jul 2019 12:47:37 +0000 (+0200)
Subject: lantiq: dts: assign the GPHY LED pins to the Ethernet controller node
X-Git-Tag: v21.02.0-rc1~4299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660200e53d627aee107ac90ba611bd762b98a4f6;p=thirdparty%2Fopenwrt.git

lantiq: dts: assign the GPHY LED pins to the Ethernet controller node

Assign the GPHY LED pins to the Ethernet 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/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
index d02c8837f4d..f22dc912dec 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -111,6 +111,11 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>,
+		    <&gphy0_led0_pins>, <&gphy0_led2_pins>,
+		    <&gphy1_led1_pins>, <&gphy1_led2_pins>;
+	pinctrl-names = "default";
+
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -196,14 +201,6 @@
 			lantiq,groups = "exin3";
 			lantiq,function = "exin";
 		};
-		gphy-leds {
-			lantiq,groups = "gphy0 led1", "gphy1 led1",
-					"gphy0 led2", "gphy1 led2";
-			lantiq,function = "gphy";
-			lantiq,pull = <2>;
-			lantiq,open-drain = <0>;
-			lantiq,output = <1>;
-		};
 		stp {
 			lantiq,groups = "stp";
 			lantiq,function = "stp";
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 d0e8cd8ced2..eabbc0257f9 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
@@ -103,6 +103,9 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>;
+	pinctrl-names = "default";
+
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -175,13 +178,6 @@
 	pinctrl-0 = <&state_default>;
 
 	state_default: pinmux {
-		gphy-leds {
-			lantiq,groups = "gphy0 led1", "gphy1 led1";
-			lantiq,function = "gphy";
-			lantiq,pull = <2>;
-			lantiq,open-drain = <0>;
-			lantiq,output = <1>;
-		};
 		phy-rst {
 			lantiq,pins = "io42";
 			lantiq,pull = <0>;
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
index f37980a5361..e074147d66e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
@@ -57,6 +57,10 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>,
+		    <&gphy0_led0_pins>, <&gphy0_led1_pins>, <&gphy0_led2_pins>,
+		    <&gphy1_led0_pins>, <&gphy1_led1_pins>, <&gphy1_led2_pins>;
+
 	interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -110,23 +114,6 @@
 	lantiq,gphy-mode = <GPHY_MODE_GE>;
 };
 
-&gpio {
-	pinctrl-names = "default";
-	pinctrl-0 = <&state_default>;
-
-	state_default: pinmux {
-		gphy-leds {
-			lantiq,groups = "gphy0 led0", "gphy0 led1",
-					"gphy0 led2", "gphy1 led0",
-					"gphy1 led1", "gphy1 led2";
-			lantiq,function = "gphy";
-			lantiq,pull = <2>;
-			lantiq,open-drain = <0>;
-			lantiq,output = <1>;
-		};
-	};
-};
-
 &localbus {
 	flash@0 {
 		compatible = "lantiq,nor";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
index 6dc45f057d9..8db1ffbf812 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
@@ -107,6 +107,11 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>,
+		    <&gphy0_led0_pins>, <&gphy0_led1_pins>,
+		    <&gphy1_led0_pins>, <&gphy1_led1_pins>;
+	pinctrl-names = "default";
+
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -189,14 +194,6 @@
 	pinctrl-0 = <&state_default>;
 
 	state_default: pinmux {
-		gphy-leds {
-			lantiq,groups = "gphy0 led0", "gphy0 led1",
-					"gphy1 led0", "gphy1 led1";
-			lantiq,function = "gphy";
-			lantiq,open-drain = <0>;
-			lantiq,pull = <2>;
-			lantiq,output = <1>;
-		};
 		pci-rst {
 			lantiq,pins = "io21";
 			lantiq,open-drain = <0>;
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 e71e3837ea4..f9e60774cbc 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
@@ -127,6 +127,9 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led0_pins>;
+	pinctrl-names = "default";
+
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -222,13 +225,6 @@
 			lantiq,pull = <0>;
 			lantiq,output = <1>;
 		};
-		gphy-leds {
-			lantiq,groups = "gphy0 led1", "gphy1 led0";
-			lantiq,function = "gphy";
-			lantiq,open-drain = <0>;
-			lantiq,pull = <0>;
-			lantiq,output = <1>;
-		};
 	};
 };
 
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 44938eddd34..93178da7e2b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
@@ -23,6 +23,9 @@
 };
 
 &eth0 {
+	pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>;
+	pinctrl-names = "default";
+
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
 		#address-cells = <1>;
@@ -95,13 +98,6 @@
 	pinctrl-0 = <&state_default>;
 
 	state_default: pinmux {
-		gphy-leds {
-			lantiq,groups = "gphy0 led1", "gphy1 led1";
-			lantiq,function = "gphy";
-			lantiq,pull = <2>;
-			lantiq,open-drain = <0>;
-			lantiq,output = <1>;
-		};
 		phy-rst {
 			lantiq,pins = "io42";
 			lantiq,pull = <0>;
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 caedad8bce7..2cb34eab010 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
@@ -213,6 +213,54 @@
 			gpio-controller;
 			reg = <0xe100b10 0xa0>;
 
+			gphy0_led0_pins: gphy0-led0 {
+				lantiq,groups = "gphy0 led0";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
+			gphy0_led1_pins: gphy0-led1 {
+				lantiq,groups = "gphy0 led1";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
+			gphy0_led2_pins: gphy0-led2 {
+				lantiq,groups = "gphy0 led2";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
+			gphy1_led0_pins: gphy1-led0 {
+				lantiq,groups = "gphy1 led0";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
+			gphy1_led1_pins: gphy1-led1 {
+				lantiq,groups = "gphy1 led1";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
+			gphy1_led2_pins: gphy1-led2 {
+				lantiq,groups = "gphy1 led2";
+				lantiq,function = "gphy";
+				lantiq,open-drain = <0>;
+				lantiq,pull = <2>;
+				lantiq,output = <1>;
+			};
+
 			mdio_pins: mdio {
 				mux {
 					lantiq,groups = "mdio";