[openwrt/openwrt] ath79: ar724x: make sure builtin-switch is enabled in DT

LEDE Commits lede-commits at lists.infradead.org
Mon Aug 17 09:19:33 EDT 2020 

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8484a764df20cdd673c74b583bfbf71e10c02726

commit 8484a764df20cdd673c74b583bfbf71e10c02726
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Fri Aug 14 15:09:29 2020 +0200

    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 &eth0/&eth1 nodes are enabled together with
    the &mdio0/&mdio1 nodes containing the builtin-switch.
    For ar7240_tplink_tl-wa.dtsi, &eth0 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 <freifunk at adrianschmutzler.de>
---
 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 5382a710f9..730c509d7b 100644
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -59,6 +59,8 @@
 };
 
 &eth0 {
+	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 a2d3a99430..cd61bdb45f 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 @@
 };
 
 &eth0 {
-	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 537a99b8db..22a1aeb0dc 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 @@
 	};
 };
 
-&eth0 {
-	status = "okay";
-};
-
 &eth1 {
 	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 c231f4721c..8ae2a128ee 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 @@
 };
 
 &eth0 {
-	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 a7e6b49c1f..e270dfa5c2 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 @@
 };
 
 &eth0 {
-	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 ac5a4d5ee9..7f671ee4bf 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 @@
 	};
 };
 
+&eth0 {
+	compatible = "syscon", "simple-mfd";
+}
+
 &eth1 {
 	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 7621b1d53c..5ceada8375 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 @@
 };
 
 &eth0 {
-	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 59fcd05f5e..4044cdee0e 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -77,6 +77,8 @@
 };
 
 &eth1 {
+	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 4d080c82f8..b4765d1a14 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 @@
 };
 
 &eth1 {
-	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 49b869f718..afd521b670 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -159,9 +159,8 @@
 };
 
 &eth1 {
-	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 bb5d6d95da..f83985cc56 100644
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -103,8 +103,6 @@
 };
 
 &eth1 {
-	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 4d2741fbe6..72913bfa2d 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 @@
 };
 
 &eth1 {
-	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 e7369f0dbf..4bccdd2e4c 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -126,7 +126,5 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	compatible = "syscon", "simple-mfd";
 };

More information about the lede-commits mailing list