Browse Source

ramips: mt7621-dts: do not claim rgmii2 group as gpio for certain devices

These devices do not use rgmii2 as gpio, therefore remove rgmii2 pin group
from state-default. Remove overwriting the ethernet node for these devices.

Move claiming the rgmii2 group from mt7621_zyxel_nwa-ax.dtsi to
mt7621_zyxel_nwa50ax.dts as it's only the latter using rgmii2 pins as gpio.

Remove duplicate ethernet overwrite from mt7621_tplink_archer-x6-v3.dtsi.

Claim rgmii2 group as gpio on mt7621_bolt_arion.dts as it uses an rgmii2
pin, 26, as gpio.

Signed-off-by: Arınç ÜNAL <[email protected]>
Arınç ÜNAL 3 years ago
parent
commit
271456abd8

+ 5 - 1
target/linux/ramips/dts/mt7621_bolt_arion.dts

@@ -163,9 +163,13 @@
 	};
 };
 
+&ethernet {
+	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
 &state_default {
 	gpio {
-		groups = "jtag", "uart2", "uart3", "wdt";
+		groups = "jtag", "uart2", "uart3", "wdt", "rgmii2";
 		function = "gpio";
 	};
 };

+ 1 - 5
target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts

@@ -152,10 +152,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &switch0 {
 	ports {
 		port@0 {
@@ -187,7 +183,7 @@
 
 &state_default {
 	gpio {
-		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		groups = "i2c", "uart2", "uart3", "sdhci";
 		function = "gpio";
 	};
 };

+ 1 - 5
target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts

@@ -149,7 +149,7 @@
 
 &state_default {
 	gpio {
-		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		groups = "i2c", "uart2", "uart3", "sdhci";
 		function = "gpio";
 	};
 };
@@ -172,10 +172,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_factory_4>;
 	nvmem-cell-names = "mac-address";

+ 1 - 5
target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts

@@ -32,7 +32,7 @@
 
 &state_default {
 	gpio {
-		groups = "uart2", "rgmii2";
+		groups = "uart2";
 		function = "gpio";
 	};
 };
@@ -112,10 +112,6 @@
 	status = "okay";
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_factory_5>;
 	nvmem-cell-names = "mac-address";

+ 1 - 5
target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts

@@ -39,10 +39,6 @@
 	status = "okay";
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &switch0 {
 	ports {
 		port@0 {
@@ -74,7 +70,7 @@
 
 &state_default {
 	gpio {
-		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		groups = "i2c", "uart2", "uart3", "sdhci";
 		function = "gpio";
 	};
 };

+ 0 - 5
target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts

@@ -163,11 +163,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_config_8>;
 	nvmem-cell-names = "mac-address";

+ 0 - 5
target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi

@@ -120,11 +120,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-};
-
 &pcie {
 	status = "okay";
 };

+ 1 - 5
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi

@@ -148,10 +148,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_factory_e000>;
 	nvmem-cell-names = "mac-address";
@@ -190,7 +186,7 @@
 
 &state_default {
 	gpio {
-		groups = "i2c", "rgmii2", "uart2", "wdt";
+		groups = "i2c", "uart2", "wdt";
 		function = "gpio";
 	};
 };

+ 1 - 5
target/linux/ramips/dts/mt7621_zyxel_nr7101.dts

@@ -143,10 +143,6 @@
 	};
 };
 
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_factory_e000>;
 	nvmem-cell-names = "mac-address";
@@ -163,7 +159,7 @@
 
 &state_default {
 	gpio {
-		groups = "i2c", "rgmii2", "uart3", "jtag", "wdt";
+		groups = "i2c", "uart3", "jtag", "wdt";
 		function = "gpio";
 	};
 };

+ 1 - 5
target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi

@@ -141,11 +141,7 @@
 
 &state_default {
 	gpio {
-		groups = "uart3", "rgmii2";
+		groups = "uart3";
 		function = "gpio";
 	};
 };
-
-&ethernet {
-	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
-};

+ 11 - 0
target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts

@@ -43,3 +43,14 @@
 		};
 	};
 };
+
+&ethernet {
+	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
+&state_default {
+        gpio {
+                groups = "uart3", "rgmii2";
+                function = "gpio";
+        };
+};