ath79: ar933x: Update dts for current ag71xx driver
authorChuanhong Guo <gch981213@gmail.com>
Tue, 17 Jul 2018 09:09:14 +0000 (17:09 +0800)
committerJohn Crispin <john@phrozen.org>
Mon, 30 Jul 2018 08:43:33 +0000 (10:43 +0200)
gmac0 is always connected to switch phy4 and mdio1 is always needed.
So add phy handle for eth0 and enable mdio1 by default.
Move fixed-link for gmac1 from device dts to ar9331.dtsi because gmac1 is always connected to builtin switch.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
target/linux/ath79/dts/ar9330.dtsi
target/linux/ath79/dts/ar9330_glinet_ar150.dts
target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
target/linux/ath79/dts/ar9331_etactica-eg200.dts
target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts
target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi

index 65445de..4649262 100644 (file)
 
        resets = <&rst 9>;
        reset-names = "mac";
-};
-
-&mdio0 {
-       regmap = <&eth1>;
-       builtin-switch;
-       resets = <&rst 23>;
-       reset-names = "mdio";
+       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,ar9330-eth", "syscon";
+       compatible = "qca,ar9330-eth", "syscon", "simple-mfd";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
        phy-mode = "gmii";
 
        resets = <&rst 13>;
        reset-names = "mac";
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
 };
index 2b2524f..5e3552a 100644 (file)
        };
 };
 
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &eth0 {
        status = "okay";
 
        mtd-mac-address = <&art 0x0>;
-
-       phy-handle = <&phy4>;
 };
 
 &eth1 {
 
        mtd-mac-address = <&art 0x0>;
 
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-
        gmac-config {
                device = <&gmac>;
 
index db4cd76..1ce8851 100644 (file)
 
        mtd-mac-address = <&art 0x1002>;
        mtd-mac-address-increment = <0x40>;
-
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-
 };
 
 &mdio1 {
index 325576e..5d6b72c 100644 (file)
        status = "okay";
 };
 
-&mdio0 {
-       status = "okay";
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &eth0 {
        status = "okay";
        mtd-mac-address = <&art 0x0>;
-       phy-handle = <&phy4>;
 
        gmac-config {
                device = <&gmac>;
        };
 };
 
+&eth1 {
+       status = "okay";
+       compatible = "syscon", "simple-mfd";
+};
+
 &spi {
        num-chipselects = <1>;
        status = "okay";
index 531a637..74db416 100644 (file)
        };
 };
 
-&mdio1 {
-       status = "okay";
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-       };
-};
 
-&eth1 {
+&eth0 {
        status = "okay";
-       phy-handle = <&phy4>;
 
        mtd-mac-address = <&uboot 0x1fc00>;
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-
        gmac-config {
-               device = <&gmac>;
+               device = <&gmac>;
 
-               switch-phy-addr-swap = <1>;
-               switch-phy-swap = <1>;
+               switch-phy-addr-swap = <0>;
+               switch-phy-swap = <0>;
        };
 };
 
+&eth1 {
+       status = "okay";
+       compatible = "syscon", "simple-mfd";
+};
+
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
index f45572a..d23dea7 100644 (file)
@@ -84,8 +84,6 @@
 &eth0 {
        status = "okay";
 
-       phy-handle = <&phy4>;
-
        mtd-mac-address = <&uboot 0x1fc00>;
 
        gmac-config {
        };
 };
 
-&gpio {
+&eth1 {
        status = "okay";
+       compatible = "syscon", "simple-mfd";
 };
 
-&mdio0 {
+&gpio {
        status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
 };
 
 &uart {
index 615d317..9d8c1a0 100644 (file)
        };
 };
 
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
 &eth0 {
        status = "okay";
 
-       phy-handle = <&phy4>;
-
        mtd-mac-address = <&uboot 0x1fc00>;
        mtd-mac-address-increment = <1>;
 
 
        mtd-mac-address = <&uboot 0x1fc00>;
        mtd-mac-address-increment = <(-1)>;
-
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
 };
 
 &gpio {