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 <arinc.unal@arinc9.com>

diff --git a/target/linux/ramips/dts/mt7621_bolt_arion.dts b/target/linux/ramips/dts/mt7621_bolt_arion.dts
index a665b7b14330b3b4d406ed52e53b2e63c96da9a4..7ba413932ea9fa9a7e01c71e330a4d1442435b07 100644 (file)
--- a/target/linux/ramips/dts/mt7621_bolt_arion.dts
+++ b/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";
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
index 74d8fbe1d1e1b3282094511bcf66fcf34b1e2cf8..5a259e154c578f8f64d5b94552079bfb6a75782e 100644 (file)
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
+++ b/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";
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
index 0f3b0fd8f010c23b253f35b48617227e43c3eafd..15d055bee65d9459344869d89403293d823aead4 100644 (file)
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
+++ b/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";

diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index 43cf502b0b25f35dee1437f234ed877be5186a66..a89d9189c09367dff55cf643a87a7c4f4c5f5313 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/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";

diff --git a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
index ce627d6621a7e84cff9679d6cfd6af7d00be078f..dcdcc261b3fb2d1e0bd2476c8cb005d778152400 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
+++ b/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";
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts b/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
index 93ceeb08f4cfa6a67e1861ef8d17425a5b380e62..67668657bd147d51f6dc34b26a157e39d9a230c5 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
+++ b/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";

diff --git a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi b/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
index 6454273f496a46dc174b79d2f9907e66f34bfbb7..217c1b60fe429f040b1240ac82b34263faa8d1c3 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
+++ b/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";
 };

diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
index 4830206ae14233b99ad39aeafb2e6c3cb747763d..356cf4b442f267f0c25d180e37e264c325596c9c 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
+++ b/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";
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts
index 71eb4c9414bdf0793202ef3dea265d3a0e1fd78f..63d992973aa027c11a43d2953f716dbc11196443 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts
+++ b/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";
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi b/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
index e1353346a8e04dcab1f6a658bbe074ccd3274d23..fa7e23dd47133cf64dfe2234551c37b236975fb5 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
+++ b/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>;
-};

diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts b/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts
index 70323f2422506858076a52b132b50d3cb467555b..62ba49e797ee56d87e8e9e0d506012c66fc99643 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts
+++ b/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";
+        };
+};