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>

diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 5382a710f941e832f48b5db7ac172b844159ff80..730c509d7bdf625e61bf8937ab7034e6b11881ee 100644 (file)
--- 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 a2d3a99430511a14fb9d9112afe548e1781bf5de..cd61bdb45f481b56b79e38f24dd57c0952381396 100644 (file)
--- 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 537a99b8dbaf74dfe2306091151e99ba1560d584..22a1aeb0dc90ba2e3f23c285455d5e8f73e4a6e1 100644 (file)
--- 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 c231f4721cfde1c1a8196db1fb8a22dd925df069..8ae2a128ee93eba651c1a7320b5a42770daa8598 100644 (file)
--- 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 a7e6b49c1f65a13f9e32a4d81d370b46f401ff4d..e270dfa5c247aaf6108f45584c58b5fb2c4b9890 100644 (file)
--- 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 ac5a4d5ee9f296275e5b3f3e432d40d37e9d5f99..7f671ee4bfd0a906cbf97aa72a99796ac666cce4 100644 (file)
--- 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 7621b1d53cecbd7c7359a97aac4793d6549d8055..5ceada8375622675f9b1e0b02960715da0d73a09 100644 (file)
--- 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 59fcd05f5ea625afcc1b3b70c857747854f3da74..4044cdee0e761ee6be021609ccded2978e191be5 100644 (file)
--- 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 4d080c82f815b12c626bc8ffa90a20f21872c7d2..b4765d1a1434a9ccaac02a743fa6f9e7e3daa0d1 100644 (file)
--- 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 49b869f718385dc2f4f9825dccd01b91758ae13f..afd521b67057f896930e82bf7c912fcb8c186639 100644 (file)
--- 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 bb5d6d95dabecb6e8fb5cab184bf709926207671..f83985cc56f2d5ace04f47a529ceb8ff4ffd58a3 100644 (file)
--- 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 4d2741fbe6b52020312ca9a7ae84c472eaa2cdc1..72913bfa2da44538e7a5300543714f64fb18042d 100644 (file)
--- 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 e7369f0dbf4aeebd3c0ffb2e2fabcdbcb334de20..4bccdd2e4c230d82a03d571c38b74f11b63d97b2 100644 (file)
--- 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";
 };