From 271456abd895934f90af37c4c4521e94fdcda4b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= Date: Sun, 14 Aug 2022 10:44:12 +0300 Subject: [PATCH] ramips: mt7621-dts: do not claim rgmii2 group as gpio for certain devices MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- target/linux/ramips/dts/mt7621_bolt_arion.dts | 6 +++++- .../linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts | 6 +----- target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts | 6 +----- .../ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts | 6 +----- .../ramips/dts/mt7621_mediatek_mt7621-eval-board.dts | 6 +----- .../linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts | 5 ----- .../linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi | 5 ----- .../linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi | 6 +----- target/linux/ramips/dts/mt7621_zyxel_nr7101.dts | 6 +----- target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi | 6 +----- target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts | 11 +++++++++++ 11 files changed, 23 insertions(+), 46 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_bolt_arion.dts b/target/linux/ramips/dts/mt7621_bolt_arion.dts index a665b7b1433..7ba413932ea 100644 --- a/target/linux/ramips/dts/mt7621_bolt_arion.dts +++ b/target/linux/ramips/dts/mt7621_bolt_arion.dts @@ -163,9 +163,13 @@ }; }; +ðernet { + 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 74d8fbe1d1e..5a259e154c5 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts @@ -152,10 +152,6 @@ }; }; -ðernet { - 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 0f3b0fd8f01..15d055bee65 100644 --- 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 @@ }; }; -ðernet { - 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 43cf502b0b2..a89d9189c09 100644 --- 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"; }; -ðernet { - 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 ce627d6621a..dcdcc261b3f 100644 --- 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"; }; -ðernet { - 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 93ceeb08f4c..67668657bd1 100644 --- 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 @@ }; }; -ðernet { - 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 6454273f496..217c1b60fe4 100644 --- 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 @@ }; }; -ðernet { - 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 4830206ae14..356cf4b442f 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi @@ -148,10 +148,6 @@ }; }; -ðernet { - 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 71eb4c9414b..63d992973aa 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts @@ -143,10 +143,6 @@ }; }; -ðernet { - 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 e1353346a8e..fa7e23dd471 100644 --- 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"; }; }; - -ðernet { - 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 70323f24225..62ba49e797e 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts @@ -43,3 +43,14 @@ }; }; }; + +ðernet { + pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>; +}; + +&state_default { + gpio { + groups = "uart3", "rgmii2"; + function = "gpio"; + }; +}; -- 2.30.2