ath79: Clean up GL-AR300M DTS/DTSI inclusions

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca956x.dtsi

diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index b6f7dcaff3546d5445892b9e04031feb85deb5d7..ee645aa02f052c22e1762e775738ea74b01a75c7 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -137,38 +137,43 @@
 
                                #reset-cells = <1>;
                        };
+               };
 
-                       wmac: wmac@18100000 {
-                               compatible = "qca,qca9560-wmac";
-                               reg = <0x18100000 0x10000>;
+               gmac: gmac@18070000 {
+                       compatible = "qca,qca9560-gmac";
+                       reg = <0x18070000 0x64>;
+               };
 
-                               interrupt-parent = <&cpuintc>;
-                               interrupts = <2>;
+               wmac: wmac@18100000 {
+                       compatible = "qca,qca9560-wmac";
+                       reg = <0x18100000 0x10000>;
 
-                               status = "disabled";
-                       };
+                       interrupt-parent = <&cpuintc>;
+                       interrupts = <2>;
 
-                       pcie: pcie-controller@18250000 {
-                               compatible = "qcom,ar7240-pci";
-                               #address-cells = <3>;
-                               #size-cells = <2>;
-                               bus-range = <0x0 0x0>;
-                               reg = <0x18250000 0x1000>, /* CRP */
-                                     <0x18280000 0x100>,  /* CTRL */
-                                     <0x16000000 0x1000>; /* CFG */
-                               reg-names = "crp_base", "ctrl_base", "cfg_base";
-                               ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000        /* pci memory */
-                                         0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
-                               interrupt-parent = <&intc3>;
-                               interrupts = <0>;
+                       status = "disabled";
+               };
 
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
+               pcie: pcie-controller@18250000 {
+                       compatible = "qcom,ar7240-pci";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       bus-range = <0x0 0x0>;
+                       reg = <0x18250000 0x1000>, /* CRP */
+                             <0x18280000 0x100>,  /* CTRL */
+                             <0x16000000 0x1000>; /* CFG */
+                       reg-names = "crp_base", "ctrl_base", "cfg_base";
+                       ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000        /* pci memory */
+                                 0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
+                       interrupt-parent = <&intc3>;
+                       interrupts = <0>;
 
-                               interrupt-map-mask = <0 0 0 1>;
-                               interrupt-map = <0 0 0 0 &pcie 0>;
-                               status = "disabled";
-                       };
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-map-mask = <0 0 0 1>;
+                       interrupt-map = <0 0 0 0 &pcie 0>;
+                       status = "disabled";
                };
 
                usb0: usb@1b000000 {
@@ -221,11 +226,6 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
-
-               gmac: gmac@18070000 {
-                       compatible = "qca,qca9560-gmac";
-                       reg = <0x18070000 0x64>;
-               };
        };
 
        usb_phy0: usb-phy {
@@ -257,7 +257,7 @@
 };
 
 &eth0 {
-       compatible = "qca,qca9560-eth", "syscon", "simple-mfd";
+       compatible = "qca,qca9560-eth", "syscon";
 
        pll-data = <0x03000000 0x00000101 0x00001919>;
        pll-reg = <0 0x48 0>;
@@ -274,12 +274,13 @@
        builtin-switch;
 
        builtin_switch: switch0@1f {
-               compatible = "qca,ar8229-builtin";
+               compatible = "qca,ar8229";
                reg = <0x1f>;
                resets = <&rst 8>;
                reset-names = "switch";
                phy-mode = "gmii";
-               phy4-mii-enable;
+               qca,phy4-mii-enable;
+               qca,mib-poll-interval = <500>;
 
                mdio-bus {
                        #address-cells = <1>;
@@ -299,7 +300,7 @@
 };
 
 &eth1 {
-       compatible = "qca,qca9560-eth", "syscon", "simple-mfd";
+       compatible = "qca,qca9560-eth", "syscon";
 
        phy-mode = "gmii";