From: Adrian Schmutzler Date: Wed, 6 Nov 2019 12:51:20 +0000 (+0100) Subject: ath79: move eth0 to parent DTSI for ar9344 TP-Link CPE devices X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15dc60e727e591a214c9ec1006ced29c3f706728;p=oweals%2Fopenwrt.git ath79: move eth0 to parent DTSI for ar9344 TP-Link CPE devices The ð0 node is the same for all TP-Link CPE devices in ar9344, so move it to parent DTSI. While at it, do some minor DTS harmonizations. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi index ff96401afc..41a9443740 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi @@ -41,16 +41,8 @@ }; }; -ð0 { - status = "okay"; - - mtd-mac-address = <&info 0x08>; - - phy-mode = "mii"; - phy-handle = <&swphy4>; -}; - ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts index 2b0f52cf4f..cb614a9dfb 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts @@ -29,15 +29,6 @@ }; }; -ð0 { - status = "okay"; - - mtd-mac-address = <&info 0x08>; - - phy-mode = "mii"; - phy-handle = <&swphy4>; -}; - ð1 { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi index 3ba964edde..440ba8a8b3 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi @@ -72,11 +72,3 @@ switch-only-mode = <1>; }; }; - -ð0 { - status = "okay"; - - phy-handle = <&swphy4>; - - mtd-mac-address = <&info 0x8>; -}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi index dc7313b58a..d002dfeb3c 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi @@ -31,10 +31,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; @@ -103,3 +103,11 @@ mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x08>; }; + +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&info 0x8>; +};