From 6c407fb5db02bc54de2098563c584509bec44432 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 27 Jan 2020 15:36:32 +0100 Subject: [PATCH] ath79: do not set inherited phy-mode/status properties again There are several cases where phy-mode and status properties are set again in DTS(I) files although those were set to the same values in parent DTSI files already. Remove those cases (and thus also stop their proliferation by copy/paste). Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7240.dtsi | 1 - target/linux/ath79/dts/ar7241.dtsi | 1 - target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts | 1 - target/linux/ath79/dts/ar9330.dtsi | 1 - target/linux/ath79/dts/ar9341.dtsi | 4 ---- target/linux/ath79/dts/ar9341_pcs_cr3000.dts | 6 ++---- target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts | 1 - target/linux/ath79/dts/qca953x.dtsi | 2 -- target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 1 - target/linux/ath79/dts/qca956x.dtsi | 2 -- target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi | 1 - 14 files changed, 2 insertions(+), 22 deletions(-) diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 268c8780f4..5382a710f9 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -65,7 +65,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 8f0eb3b270..59fcd05f5e 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -46,7 +46,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts index 3e6dd2daea..e55affdf20 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts @@ -119,7 +119,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; mtd-mac-address = <&uboot 0x1fc00>; phy-handle = <&phy12>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 64c135405b..042b70e0bb 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -170,7 +170,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar9341.dtsi b/target/linux/ath79/dts/ar9341.dtsi index a7c5ac6262..10161f32ac 100644 --- a/target/linux/ath79/dts/ar9341.dtsi +++ b/target/linux/ath79/dts/ar9341.dtsi @@ -17,10 +17,6 @@ interrupts = <2>; }; -ð0 { - phy-mode = "mii"; -}; - ð1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts index 222516f9b7..272b0909b5 100644 --- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts +++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts @@ -150,13 +150,11 @@ }; ð1 { - status = "okay"; - phy-handle = <&swphy4>; - mtd-mac-address = <&art 0x0>; - phy-mode = "gmii"; pll-data = <0x06000000 0x00000101 0x00001616>; + mtd-mac-address = <&art 0x0>; + gmac-config { device = <&gmac>; switch-phy-swap = <1>; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts index eac2a4268a..7ca61fe27a 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts @@ -26,7 +26,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&phy0>; gmac-config { diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index f127d4d01b..73a6ad91e5 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -231,8 +231,6 @@ reset-names = "mac"; resets = <&rst 9>; - - phy-mode = "mii"; }; &mdio1 { diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts index 6412252590..75cc5761ba 100644 --- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts +++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts @@ -153,7 +153,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy0>; gmac-config { diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts index f894fc8672..e7b30df81f 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts @@ -181,7 +181,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&info 0x8>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index 00cd413bd2..c8e4710b39 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -136,7 +136,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy0>; mtd-mac-address = <&mac 0x8>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index cee30a13b6..9b51ebf689 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -88,7 +88,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&mac 0x8>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index ee645aa02f..03541b86fb 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -307,8 +307,6 @@ resets = <&rst 13>; reset-names = "mac"; - status = "disabled"; - fixed-link { speed = <1000>; full-duplex; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi index fb5941657d..aeb5525308 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi @@ -73,7 +73,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&uboot 0x1fc00>; -- 2.30.2