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 <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 268c8780f4a339170a9336908957b8d9b3f6c1a3..5382a710f941e832f48b5db7ac172b844159ff80 100644 (file)
--- 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 8f0eb3b270a5a28b0961267a4c2de457b07061ac..59fcd05f5ea625afcc1b3b70c857747854f3da74 100644 (file)
--- 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 3e6dd2daea6c9c3e203fa50c1d9c952da96f66ca..e55affdf2031c2cf88650ee3ec84391703da6b63 100644 (file)
--- 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 @@
 &eth0 {
        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 64c135405b978e3c06eae65a0b62e93b3a73907f..042b70e0bb41019b894a191e8128ec72dd6b8850 100644 (file)
--- 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 a7c5ac6262f08330a71188774f45feebc164b0b9..10161f32ac4a9356b222316991f48634fa1ea0a9 100644 (file)
--- a/target/linux/ath79/dts/ar9341.dtsi
+++ b/target/linux/ath79/dts/ar9341.dtsi
@@ -17,10 +17,6 @@
        interrupts = <2>;
 };
 
-&eth0 {
-       phy-mode = "mii";
-};
-
 &eth1 {
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 222516f9b7927f9aa142e7f84622ff01aa47e244..272b0909b5bf7f18eb2dd50640f95840b1e148c0 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -150,13 +150,11 @@
 };
 
 &eth1 {
-       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 eac2a4268a9e156abfd80d99ca2aaf3d76a1ed1a..7ca61fe27a55b68311efb91cf21713587a0b8d99 100644 (file)
--- 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 @@
 &eth0 {
        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 f127d4d01b2306bad052c916f1e2cdfe8c32c10c..73a6ad91e5fdbe39e1b80f542db2f4ef541d0676 100644 (file)
--- 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 64122525907020dddc154fb924824deb78335aa7..75cc5761ba7b1cfa0944f11b8fb9e7177dc41a88 100644 (file)
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -153,7 +153,6 @@
 &eth0 {
        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 f894fc867296049add271a50e22d3a3050c0e2b3..e7b30df81f0a5347815a887856e333f97527fa38 100644 (file)
--- 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 @@
 &eth0 {
        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 00cd413bd2793886cedc22f755394d47252103b0..c8e4710b39a1a1efd79d15304067a237eed33eef 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -136,7 +136,6 @@
 &eth0 {
        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 cee30a13b686fab3c71a63b074160517758386b2..9b51ebf68920b815dc2aa533062799d1a8d9cfc3 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -88,7 +88,6 @@
 &eth0 {
        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 ee645aa02f052c22e1762e775738ea74b01a75c7..03541b86fbe2d8d2fe06e023f3e47976840a1995 100644 (file)
--- 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 fb5941657df293a8623c3a430f1226a10f316b3a..aeb552530890d87766e887741bf2c5cae36f5b32 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
@@ -73,7 +73,6 @@
 &eth0 {
        status = "okay";
 
-       phy-mode = "mii";
        phy-handle = <&swphy4>;
 
        mtd-mac-address = <&uboot 0x1fc00>;