ath79: harmonize appearance of ethX nodes in qca953x DTSes

This harmonizes the appearance of ethX nodes in qca953x DTSes by:
- having the same order of nodes and properties
- removing redundant status property on eth1 (set in qca953x.dtsi)

This is meant to help both copy-pasters and reviewers, since
deviations and errors can be spotted easier.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 118704ab403d9f37e3f1c7bb8a4194c6ce9eeab0..c3bac88228eb5f8afb7c3b3e6d306017e8794755 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -93,6 +93,7 @@
        status = "okay";
 
        phy-handle = <&swphy0>;
+
        mtd-mac-address = <&art 0x6>;
 
        gmac-config {
@@ -104,8 +105,6 @@
 };
 
 &eth1 {
-       status = "okay";
-
        mtd-mac-address = <&art 0x0>;
 };
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
index 433a7e9c5f3057309f6d225d270395a0e0f683cf..38201196626cfc7a1734b7d87a1ac9aa4c86660b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
@@ -124,7 +124,9 @@
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy0>;
+
        mtd-mac-address = <&art 0x1002>;
 
        gmac-config {
@@ -134,7 +136,6 @@
 };
 
 &eth1 {
-       status = "okay";
        mtd-mac-address = <&art 0x0>;
 };
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index 192b7112a9b43460f3660f25f0a3a7663a69c083..5c83170cc112f5dec5b971f777fea9b7336afa9b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -139,12 +139,13 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
-       status = "okay";
        mtd-mac-address = <&art 0x6>;
 };
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index 74a3554bcb57ef4fb478d0a3fa0597f7f13dead6..50d602fbb13dc141552e54829df568808bfcfadb 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -124,8 +124,10 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
@@ -134,6 +136,7 @@
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index 06c8f0737ee2fb54d353e74a95aa24824f9894b9..5ed63e0b2691eb8880b6223ef0f9697ffd28b3dd 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -115,6 +115,7 @@
        status = "okay";
 
        phy-handle = <&swphy4>;
+
        mtd-mac-address = <&art 0x0>;
        mtd-mac-address-increment = <1>;
 };

diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 343a02e38ad72deb7eb8cd6601c8eafb4c28f0e2..4fb2f849511d9560c6c5df658e78dbcbeb65e215 100644 (file)
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -105,10 +105,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&uboot 0x2e018>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -117,6 +113,10 @@
        mtd-mac-address = <&uboot 0x2e010>;
 };
 
+&eth1 {
+       mtd-mac-address = <&uboot 0x2e018>;
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 242dccdcf912dc3c287f49090bea9e4d3307330d..c8bfd2c8b88aad861c3f4b8dda83659c6242150e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -136,10 +136,6 @@
        phy-handle = <&swphy4>;
 };
 
-&eth1 {
-       status = "okay";
-};
-
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index d769225fd4c3e86da49b1c013b005d5830c16bc0..c65f81032a93caaab81f4ce3a1cb6605c39f4091 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -150,8 +150,10 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index dcffccf0a8d666f3f54d0cba7d3aec9ac11e3f86..2726d8ea0ac4472f105c160b9fcb69241b37a707 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -132,8 +132,10 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
@@ -143,5 +145,6 @@
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
index 1fc96bc1e560b1b1b783e4373f81133e9cb38f25..18769c9e09e9a8069d691b1c33ef757744800c0b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
@@ -124,8 +124,9 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index c845b5465acdae0187912ea6bec4490babef17a8..3582dd4acbc59a39ce78d2c9c4384031bbd6580b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -121,8 +121,10 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
@@ -132,5 +134,6 @@
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };

diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index 25a97edfca2d3890e66e080447ad6e0622689d50..bc2a0c48b57ef189b964a3fdd1a64053698dbe35 100644 (file)
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -122,9 +122,9 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
-
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 3aa6bd1367b0e24d3930bfe7f5262a5b4cf24d08..0937a0b47d25bfdb13075345795d6a0bcb38acdb 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -146,10 +146,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&romfile 0xf100>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -159,6 +155,10 @@
        mtd-mac-address-increment = <1>;
 };
 
+&eth1 {
+       mtd-mac-address = <&romfile 0xf100>;
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index be0387830a5fc4d9e55c039590869c64a5640471..978ad859f39eb34cb5377683c35a7bdb0d614db5 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -173,10 +173,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -186,6 +182,10 @@
        mtd-mac-address-increment = <1>;
 };
 
+&eth1 {
+       mtd-mac-address = <&uboot 0x1fc00>;
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index 21283d98dfade5bb4e06161576f83c20b4b65043..1ff45e91c7d2db22f5e1ce12832f254eadeeb68f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -55,21 +55,6 @@
        };
 };
 
-&eth0 {
-       status = "okay";
-
-       phy-handle = <&swphy4>;
-       mtd-mac-address = <&art 0x0>;
-};
-
-&eth1 {
-       mtd-mac-address = <&art 0x6>;
-};
-
-&pcie0 {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
 
@@ -115,6 +100,22 @@
        status = "okay";
 };
 
+&eth0 {
+       status = "okay";
+
+       phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
+};
+
+&eth1 {
+       mtd-mac-address = <&art 0x6>;
+};
+
+&pcie0 {
+       status = "okay";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index 45e3727daad225df22b15b5d1fcab08989ce4b4a..074363b17f012cc05f7c108454f5cf86ce07885c 100644 (file)
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -139,13 +139,12 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
-       status = "okay";
-
        mtd-mac-address = <&art 0x1002>;
 
        gmac-config {

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
index dd90eb1c7d67a696687aa02dd6a7d68cbc10d85e..813430590f7cc1b4f6268df314e61a52a370ff65 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
@@ -21,8 +21,6 @@
 };
 
 &eth1 {
-       status = "okay";
-
        mtd-mac-address = <&info 0x8>;
 
        gmac-config {

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index fb805ff66ab89662f59ffb7a8a77bb8d60844a6e..1180cc46c412d92236de24a08656c8a92e956f27 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -109,17 +109,17 @@
        };
 };
 
-&wmac {
+&eth0 {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       phy-handle = <&swphy4>;
+
        mtd-mac-address = <&info 0x8>;
 };
 
-&eth0 {
+&wmac {
        status = "okay";
 
-       phy-handle = <&swphy4>;
-
+       mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index f2e2dee04f1208d626d6f5813d749779bae4a309..e103b66cbdd69ed5072639530bf6aa1d0ff3b4fa 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -140,13 +140,6 @@
        };
 };
 
-&wmac {
-       status = "okay";
-
-       mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&config 0x10008>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -158,3 +151,10 @@
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
+       mtd-mac-address = <&config 0x10008>;
+};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index df920c842f3a795f7ee4be6e25ad1bca76234e03..0fadab9f6f15135212974e769452cb443a11fdc3 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -74,13 +74,6 @@
        };
 };
 
-&wmac {
-       status = "okay";
-
-       mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -93,3 +86,10 @@
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
+       mtd-mac-address = <&uboot 0x1fc00>;
+};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index ade5dec7185d2ef9e829da5257702f3b2eaae59c..249a3e1eefbf7267388621ebb352f8a507369c99 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -109,10 +109,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -122,6 +118,10 @@
        mtd-mac-address-increment = <1>;
 };
 
+&eth1 {
+       mtd-mac-address = <&uboot 0x1fc00>;
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 497b0cd26cf3375083415de026d40b769762bf67..e169d98c8554847ffbc624d801438808385fa647 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -150,10 +150,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -163,6 +159,10 @@
        mtd-mac-address-increment = <1>;
 };
 
+&eth1 {
+       mtd-mac-address = <&uboot 0x1fc00>;
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
index ded95f3a182554b5326e9bc2928c445463a490ee..e266066e2eadf31ca986ee0ea7d88fd091bd829f 100644 (file)
--- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
@@ -79,12 +79,13 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
-       status = "okay";
        mtd-mac-address = <&art 0x6>;
 
        gmac-config {

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index fcfd82702cd8ceed112f61fd7bc02c20925d4d32..3b4b1a57ed2663769a369347e2b1856e64675d28 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -91,10 +91,6 @@
        };
 };
 
-&eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
-};
-
 &eth0 {
        status = "okay";
 
@@ -104,6 +100,10 @@
        mtd-mac-address-increment = <1>;
 };
 
+&eth1 {
+       mtd-mac-address = <&uboot 0x1fc00>;
+};
+
 &wmac {
        status = "okay";