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)

diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 268c8780f4a339170a9336908957b8d9b3f6c1a3..301ae67323fc6f51e36d22775a9d044301e0589f 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 042219b2344c10d0cb7d5e63872fd8179b534413..84cd969cf399a9252db574f6fa0df61296e4373a 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_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 07a2217a7730a0cfddc0ad169191a8442b8769af..fb2c8deb39161881fba9291f12df677ea28cb040 100644 (file)
--- 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 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 8f0eb3b270a5a28b0961267a4c2de457b07061ac..417634b8ae111a18973ff252b5f99c0f0c0e1765 100644 (file)
--- 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 fa6ba71925c444fccd8561e6594ce58a1bbf3435..568d951173a3d948091a3fc64c93a60078c60121 100644 (file)
--- 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 282446b1e1884bce94294c2f1aaa13fa990d1e8b..febd3436e932524e93b93a085c4842b2892db455 100644 (file)
--- 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 27aec88cca24c93b4f4c15838b98697e94fb7fc2..1068c85519970fcbe7424e5240a8549e71d08c46 100644 (file)
--- 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";
 };