From 5dc74ad7f3d170d3dde893a66e896de46ec65478 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 12 Aug 2020 14:20:18 +0200 Subject: 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 --- target/linux/ath79/dts/qca9531_8dev_lima.dts | 3 +-- .../linux/ath79/dts/qca9531_comfast_cf-e313ac.dts | 3 ++- .../ath79/dts/qca9531_comfast_cf-e314n-v2.dts | 5 ++-- target/linux/ath79/dts/qca9531_comfast_cf-e5.dts | 5 +++- target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts | 1 + .../linux/ath79/dts/qca9531_compex_wpj531-16m.dts | 8 +++--- .../linux/ath79/dts/qca9531_engenius_ews511ap.dts | 4 --- .../linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi | 4 ++- target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts | 5 +++- target/linux/ath79/dts/qca9531_glinet_gl-e750.dts | 3 ++- target/linux/ath79/dts/qca9531_glinet_gl-x750.dts | 5 +++- target/linux/ath79/dts/qca9531_telco_t1.dts | 4 +-- .../ath79/dts/qca9531_tplink_archer-d50-v1.dts | 8 +++--- .../ath79/dts/qca9531_tplink_tl-mr3420-v3.dts | 8 +++--- target/linux/ath79/dts/qca9531_yuncore_a770.dts | 31 +++++++++++----------- .../ath79/dts/qca9533_comfast_cf-e110n-v2.dts | 5 ++-- .../linux/ath79/dts/qca9533_tplink_cpe220-v3.dts | 2 -- target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 10 +++---- .../ath79/dts/qca9533_tplink_tl-wa850re-v2.dts | 14 +++++----- .../linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi | 14 +++++----- .../linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi | 8 +++--- .../ath79/dts/qca9533_tplink_tl-wr842n-v3.dts | 8 +++--- target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts | 5 ++-- .../linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi | 8 +++--- 24 files changed, 90 insertions(+), 81 deletions(-) (limited to 'target/linux/ath79/dts') diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts index 118704ab40..c3bac88228 100644 --- 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 @@ }; ð1 { - 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 433a7e9c5f..3820119662 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts @@ -124,7 +124,9 @@ ð0 { status = "okay"; + phy-handle = <&swphy0>; + mtd-mac-address = <&art 0x1002>; gmac-config { @@ -134,7 +136,6 @@ }; ð1 { - 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 192b7112a9..5c83170cc1 100644 --- 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 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { - 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 74a3554bcb..50d602fbb1 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts @@ -124,8 +124,10 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { @@ -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 06c8f0737e..5ed63e0b26 100644 --- 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 343a02e38a..4fb2f84951 100644 --- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts +++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts @@ -105,10 +105,6 @@ }; }; -ð1 { - mtd-mac-address = <&uboot 0x2e018>; -}; - ð0 { status = "okay"; @@ -117,6 +113,10 @@ mtd-mac-address = <&uboot 0x2e010>; }; +ð1 { + 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 242dccdcf9..c8bfd2c8b8 100644 --- 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>; }; -ð1 { - 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 d769225fd4..c65f81032a 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi @@ -150,8 +150,10 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts index dcffccf0a8..2726d8ea0a 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts @@ -132,8 +132,10 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { @@ -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 1fc96bc1e5..18769c9e09 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts @@ -124,8 +124,9 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts index c845b5465a..3582dd4acb 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts @@ -121,8 +121,10 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { @@ -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 25a97edfca..bc2a0c48b5 100644 --- a/target/linux/ath79/dts/qca9531_telco_t1.dts +++ b/target/linux/ath79/dts/qca9531_telco_t1.dts @@ -122,9 +122,9 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; - phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { 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 3aa6bd1367..0937a0b47d 100644 --- 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 @@ }; }; -ð1 { - mtd-mac-address = <&romfile 0xf100>; -}; - ð0 { status = "okay"; @@ -159,6 +155,10 @@ mtd-mac-address-increment = <1>; }; +ð1 { + 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 be0387830a..978ad859f3 100644 --- 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 @@ }; }; -ð1 { - mtd-mac-address = <&uboot 0x1fc00>; -}; - ð0 { status = "okay"; @@ -186,6 +182,10 @@ mtd-mac-address-increment = <1>; }; +ð1 { + 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 21283d98df..1ff45e91c7 100644 --- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts +++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts @@ -55,21 +55,6 @@ }; }; -ð0 { - status = "okay"; - - phy-handle = <&swphy4>; - mtd-mac-address = <&art 0x0>; -}; - -ð1 { - mtd-mac-address = <&art 0x6>; -}; - -&pcie0 { - status = "okay"; -}; - &spi { status = "okay"; @@ -115,6 +100,22 @@ status = "okay"; }; +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; +}; + +ð1 { + 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 45e3727daa..074363b17f 100644 --- 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 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { - 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 dd90eb1c7d..813430590f 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts +++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts @@ -21,8 +21,6 @@ }; ð1 { - 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 fb805ff66a..1180cc46c4 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi @@ -109,17 +109,17 @@ }; }; -&wmac { +ð0 { status = "okay"; - mtd-cal-data = <&art 0x1000>; + phy-handle = <&swphy4>; + mtd-mac-address = <&info 0x8>; }; -ð0 { +&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 f2e2dee04f..e103b66cbd 100644 --- 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>; -}; - ð0 { status = "okay"; @@ -158,3 +151,10 @@ ð1 { 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 df920c842f..0fadab9f6f 100644 --- 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>; -}; - ð0 { status = "okay"; @@ -93,3 +86,10 @@ ð1 { 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 ade5dec718..249a3e1eef 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi @@ -109,10 +109,6 @@ }; }; -ð1 { - mtd-mac-address = <&uboot 0x1fc00>; -}; - ð0 { status = "okay"; @@ -122,6 +118,10 @@ mtd-mac-address-increment = <1>; }; +ð1 { + 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 497b0cd26c..e169d98c85 100644 --- 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 @@ }; }; -ð1 { - mtd-mac-address = <&uboot 0x1fc00>; -}; - ð0 { status = "okay"; @@ -163,6 +159,10 @@ mtd-mac-address-increment = <1>; }; +ð1 { + 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 ded95f3a18..e266066e2e 100644 --- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts +++ b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts @@ -79,12 +79,13 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x0>; + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; }; ð1 { - 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 fcfd82702c..3b4b1a57ed 100644 --- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi +++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi @@ -91,10 +91,6 @@ }; }; -ð1 { - mtd-mac-address = <&uboot 0x1fc00>; -}; - ð0 { status = "okay"; @@ -104,6 +100,10 @@ mtd-mac-address-increment = <1>; }; +ð1 { + mtd-mac-address = <&uboot 0x1fc00>; +}; + &wmac { status = "okay"; -- cgit v1.2.3