ath79: ar7241: Update dts for current ag71xx driver

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index 91ebea54e0edb78d77bddf371ea88d6a370752dd..baf34e28a661e6a9d181745e305cbc237f90594d 100644 (file)
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -39,13 +39,6 @@
        };
 };
 
-&mdio0 {
-       regmap = <&eth1>;
-       builtin-switch;
-       resets = <&rst 22>;
-       reset-names = "mdio";
-};
-
 &eth0 {
        compatible = "qca,ar7241-eth", "syscon";
 
@@ -53,16 +46,35 @@
 
        resets = <&rst 8>, <&rst 9>;
        reset-names = "mac", "phy";
+       phy-mode = "mii";
+       phy-handle = <&swphy4>;
 };
 
 &mdio1 {
+       status = "okay";
+
        resets = <&rst 23>;
        reset-names = "mdio";
        builtin-switch;
+
+       builtin_switch: switch0@1f {
+               compatible = "qca,ar8216-builtin";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               reg = <0x1f>;
+
+               mdio-bus {
+                       swphy4: ethernet-phy@4 {
+                               reg = <4>;
+                               phy-mode = "mii";
+                       };
+               };
+       };
 };
 
 &eth1 {
-       compatible = "qca,ar7241-eth", "syscon";
+       compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
 

diff --git a/target/linux/ath79/dts/ar7241_tp-link.dtsi b/target/linux/ath79/dts/ar7241_tp-link.dtsi
index 3846d811ac1f794550f4e8865f5b125c8c6230ca..6cc515b7ccedef434d7400ca452203d765f89e6d 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tp-link.dtsi
+++ b/target/linux/ath79/dts/ar7241_tp-link.dtsi
@@ -97,8 +97,6 @@
 &eth0 {
        status = "okay";
 
-       phy-handle = <&phy4>;
-
        mtd-mac-address = <&uboot 0x1fc00>;
        mtd-mac-address-increment = <(-1)>;
 };
@@ -110,15 +108,6 @@
        mtd-mac-address-increment = <1>;
 };
 
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &gpio {
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
index 0de97ea9335a83bcac3c5e092556893678d8e176..33790f2e1c0ec2af25176de59359440d00ea46a5 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
@@ -9,5 +9,5 @@
 };
 
 &eth1 {
-       compatible = "syscon";
+       compatible = "syscon", "simple-mfd";
 };

diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
index 36fa2750a72c981e6d09a7df143b8e73d4ff9696..4053147c9c143f93f60449b0c0951835476be5de 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
@@ -9,7 +9,7 @@
 };
 
 &eth1 {
-       compatible = "syscon";
+       compatible = "syscon", "simple-mfd";
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index adcaf748bb7c6428d89f5b2bb0761d240f6daaa2..7294fb4ac8eda88384dcc42c23d30547cfb313b2 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -117,24 +117,14 @@
        };
 };
 
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &eth0 {
        status = "okay";
 
        mtd-mac-address = <&art 0x0>;
-       phy-handle = <&phy4>;
 };
 
 &eth1 {
        status = "okay";
 
-       compatible = "syscon";
+       compatible = "syscon", "simple-mfd";
 };

diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index a08c9da846bb9d158af2d7ad80bd66360c2656ee..e07e9c662ba607ca9d4eee891c34ff87adb2f0c7 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -122,22 +122,10 @@
        };
 };
 
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &eth0 {
        status = "okay";
 
        mtd-mac-address = <&art 0x0>;
-
-       phy-mode = "mii";
-       phy-handle = <&phy4>;
 };
 
 &eth1 {