From be09fdbf36c0a69e7fd024328a793313ae3bafd3 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 14 Aug 2020 15:09:29 +0200
Subject: 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@adrianschmutzler.de>
(cherry picked from commit 8484a764df20cdd673c74b583bfbf71e10c02726)
---
 target/linux/ath79/dts/ar7240.dtsi                    | 2 ++
 target/linux/ath79/dts/ar7240_buffalo_whr-g301n.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_tplink.dtsi             | 2 --
 target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts | 2 --
 target/linux/ath79/dts/ar7241_ubnt_unifi.dts          | 2 --
 9 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 268c8780f4..301ae67323 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 042219b234..84cd969cf3 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_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 07a2217a77..fb2c8deb39 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -105,8 +105,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 8f0eb3b270..417634b8ae 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -78,6 +78,8 @@
 };
 
 &eth1 {
+	status = "okay";
+
 	compatible = "qca,ar7241-eth", "syscon";
 
 	pll-data = <0x00110000 0x00001099 0x00991099>;
diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index fa6ba71925..568d951173 100644
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -102,8 +102,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 282446b1e1..febd3436e9 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -149,8 +149,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 27aec88cca..1068c85519 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -123,7 +123,5 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	compatible = "syscon", "simple-mfd";
 };
-- 
cgit v1.2.3