From 9483e6d8a9343be9a1230e03b92ec4ca47bfd740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?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=UTF-8 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_buffalo_wsr-1166dhp.dts | 6 +----- target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts | 6 +----- target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts | 6 +----- .../linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts | 6 +----- target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts | 5 ----- target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi | 5 ----- target/linux/ramips/dts/mt7621_zyxel_nr7101.dts | 6 +----- 7 files changed, 5 insertions(+), 35 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts index 74d8fbe1d..5a259e154 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 04ec3ab49..3436757e1 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 { mtd-mac-address = <&factory 0x4>; }; 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 6d94e5e52..811b02fe0 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 { mtd-mac-address = <&factory 0x5>; }; 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 ce627d662..dcdcc261b 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 7d38b7b09..01f338186 100644 --- a/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts @@ -161,11 +161,6 @@ }; }; -ðernet { - pinctrl-names = "default"; - pinctrl-0 = <&rgmii1_pins &mdio_pins>; -}; - &gmac0 { mtd-mac-address = <&config 0x8>; }; 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 76d9908fb..b6d0c1e53 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_zyxel_nr7101.dts b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts index affc99b8c..86b39b991 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 { mtd-mac-address = <&factory 0xe000>; }; @@ -162,7 +158,7 @@ &state_default { gpio { - groups = "i2c", "rgmii2", "uart3", "jtag", "wdt"; + groups = "i2c", "uart3", "jtag", "wdt"; function = "gpio"; }; };