ath79: ar93xx/qca95xx: move gmac/wmac/pcie node out of apb bus

[openwrt/staging/dedeckeh.git] / target / linux / ath79 / dts / qca953x.dtsi

diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index 45e5b851fa537a67547e6735df19ad4253e38fe0..7a7d178ff48e6d02ab2292b957bffad8323f6e22 100644 (file)
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -143,43 +143,43 @@
                                        qca,ddr-wb-channels = <&ddr_ctrl 4>, <&ddr_ctrl 3>;
                                };
                        };
+               };
 
-                       pcie0: pcie-controller@180c0000 {
-                               compatible = "qcom,ar7240-pci";
-                               #address-cells = <3>;
-                               #size-cells = <2>;
-                               bus-range = <0x0 0x0>;
-                               reg = <0x180c0000 0x1000>, /* CRP */
-                                     <0x180f0000 0x100>,  /* CTRL */
-                                     <0x14000000 0x1000>; /* CFG */
-                               reg-names = "crp_base", "ctrl_base", "cfg_base";
-                               ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000        /* pci memory */
-                                         0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
-                               interrupt-parent = <&intc2>;
-                               interrupts = <1>;
-
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
-
-                               interrupt-map-mask = <0 0 0 1>;
-                               interrupt-map = <0 0 0 0 &pcie0 0>;
-                               status = "disabled";
-                       };
+               gmac: gmac@18070000 {
+                       compatible = "qca,ar9330-gmac";
+                       reg = <0x18070000 0x4>;
+               };
 
-                       gmac: gmac@18070000 {
-                               compatible = "qca,ar9330-gmac";
-                               reg = <0x18070000 0x4>;
-                       };
+               pcie0: pcie-controller@180c0000 {
+                       compatible = "qcom,ar7240-pci";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       bus-range = <0x0 0x0>;
+                       reg = <0x180c0000 0x1000>, /* CRP */
+                             <0x180f0000 0x100>,  /* CTRL */
+                             <0x14000000 0x1000>; /* CFG */
+                       reg-names = "crp_base", "ctrl_base", "cfg_base";
+                       ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000        /* pci memory */
+                                 0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
+                       interrupt-parent = <&intc2>;
+                       interrupts = <1>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-map-mask = <0 0 0 1>;
+                       interrupt-map = <0 0 0 0 &pcie0 0>;
+                       status = "disabled";
+               };
 
-                       wmac: wmac@18100000 {
-                               compatible = "qca,qca9530-wmac";
-                               reg = <0x18100000 0x20000>;
+               wmac: wmac@18100000 {
+                       compatible = "qca,qca9530-wmac";
+                       reg = <0x18100000 0x20000>;
 
-                               interrupt-parent = <&intc2>;
-                               interrupts = <0>;
+                       interrupt-parent = <&intc2>;
+                       interrupts = <0>;
 
-                               status = "disabled";
-                       };
+                       status = "disabled";
                };
 
                usb0: usb@1b000000 {