From 2cf2731d958968a959ba8c3f4b0adff729e69627 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 14 Aug 2020 15:09:29 +0200 Subject: [PATCH] ath79: ar724x: make sure builtin-switch is enabled in DT On ar7240/ar7241 the mdioX node with the builtin-switch is enabled in the DTSI files, but the parent ethX node is left disabled. It only gets enabled per device or device family, and has not been enabled at all yet for the TP-Link WA devices with ar7240, making the switch unavailable there. This patch makes sure ð0/ð1 nodes are enabled together with the &mdio0/&mdio1 nodes containing the builtin-switch. For ar7240_tplink_tl-wa.dtsi, ð0 is properly hidden again via compatible = "syscon", "simple-mfd"; This partially fixes FS#2887, however it seems dmesg still does not show cable (dis)connect in dmesg for ar7240 TP-Link WA devices. Signed-off-by: Adrian Schmutzler Signed-off-by: maurerr --- target/linux/ath79/dts/ar7240.dtsi | 2 ++ target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts | 2 -- target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts | 4 ---- target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts | 2 -- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 2 -- target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi | 4 ++++ target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi | 2 -- target/linux/ath79/dts/ar7241.dtsi | 2 ++ target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts | 3 +-- target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi | 3 +-- target/linux/ath79/dts/ar7241_tplink.dtsi | 2 -- target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts | 2 -- target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 2 -- 13 files changed, 10 insertions(+), 22 deletions(-) diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 5382a710f94..730c509d7bd 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -59,6 +59,8 @@ }; ð0 { + status = "okay"; + compatible = "qca,ar7240-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts index a2d3a994305..cd61bdb45f4 100644 --- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts +++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts @@ -156,8 +156,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x120c>; }; diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts index 537a99b8dba..22a1aeb0dc9 100644 --- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts +++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts @@ -139,10 +139,6 @@ }; }; -ð0 { - status = "okay"; -}; - ð1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts index c231f4721cf..8ae2a128ee9 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -174,8 +174,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index a7e6b49c1f6..e270dfa5c24 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -106,8 +106,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi index ac5a4d5ee9f..7f671ee4bfd 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi @@ -9,6 +9,10 @@ }; }; +ð0 { + compatible = "syscon", "simple-mfd"; +} + ð1 { mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi index 7621b1d53ce..5ceada83756 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi @@ -30,8 +30,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <(-1)>; }; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 59fcd05f5ea..4044cdee0e7 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -77,6 +77,8 @@ }; ð1 { + status = "okay"; + compatible = "qca,ar7241-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts index 4d080c82f81..b4765d1a143 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -183,9 +183,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi index 49b869f7183..afd521b6705 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi @@ -159,9 +159,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index bb5d6d95dab..f83985cc56f 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -103,8 +103,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts index 4d2741fbe6b..72913bfa2da 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts +++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts @@ -150,8 +150,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index e7369f0dbf4..4bccdd2e4c2 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -126,7 +126,5 @@ }; ð1 { - status = "okay"; - compatible = "syscon", "simple-mfd"; };