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

[openwrt/staging/chunkeey.git] / target / linux / ath79 / dts / qca9557.dtsi

diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi
index 379e257d021f561e88d518518ebd3c14830cf84e..b29dfc72b26a7509cff708108dfe9e8dea1290c6 100644 (file)
--- a/target/linux/ath79/dts/qca9557.dtsi
+++ b/target/linux/ath79/dts/qca9557.dtsi
@@ -53,8 +53,9 @@
                                status = "disabled";
                        };
 
-                       usb_phy0: usb-phy0 {
+                       usb_phy0: usb-phy0@18030000 {
                                compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
+                               reg = <0x18030000 4>, <0x18030004 4>;
 
                                reset-names = "usb-phy", "usb-suspend-override";
                                resets = <&rst 4>, <&rst 3>;
@@ -64,8 +65,9 @@
                                status = "disabled";
                        };
 
-                       usb_phy1: usb-phy1 {
+                       usb_phy1: usb-phy1@18030010 {
                                compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
+                               reg = <0x18030010 4>, <0x18030014 4>;
 
                                reset-names = "usb-phy", "usb-suspend-override";
                                resets = <&rst2 4>, <&rst2 3>;
@@ -93,7 +95,7 @@
                        pinmux: pinmux@1804002c {
                                compatible = "pinctrl-single";
 
-                               reg = <0x1804002c 0x40>;
+                               reg = <0x1804002c 0x44>;
 
                                #size-cells = <0>;
 
@@ -130,8 +132,7 @@
 
                        rst: reset-controller@1806001c {
                                compatible = "qca,qca9550-reset",
-                                               "qca,ar7100-reset",
-                                                "simple-bus";
+                                               "qca,ar7100-reset";
                                reg = <0x1806001c 0x4>;
 
                                #reset-cells = <1>;
@@ -175,65 +176,65 @@
 
                                #reset-cells = <1>;
                        };
+               };
 
-                       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>;
+               gmac: gmac@18070000 {
+                       compatible = "qca,qca9550-gmac";
+                       reg = <0x18070000 0x58>;
+               };
 
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
+               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 0x02000000        /* pci memory */
+                                 0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
+                       interrupt-parent = <&intc2>;
+                       interrupts = <1>;
 
-                               interrupt-map-mask = <0 0 0 1>;
-                               interrupt-map = <0 0 0 0 &pcie0 0>;
-                               status = "disabled";
-                       };
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
 
-                       pcie1: 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 &pcie0 0>;
+                       status = "disabled";
+               };
 
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
+               wmac: wmac@18100000 {
+                       compatible = "qca,qca9550-wmac";
+                       reg = <0x18100000 0x10000>;
 
-                               interrupt-map-mask = <0 0 0 1>;
-                               interrupt-map = <0 0 0 0 &pcie1 0>;
-                               status = "disabled";
-                       };
+                       interrupt-parent = <&intc2>;
+                       interrupts = <0>;
 
-                       gmac: gmac@18070000 {
-                               compatible = "qca,qca9550-gmac";
-                               reg = <0x18070000 0x14>;
-                       };
+                       status = "disabled";
+               };
 
-                       wmac: wmac@18100000 {
-                               compatible = "qca,qca9550-wmac";
-                               reg = <0x18100000 0x10000>;
+               pcie1: 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 0x0000001 0 0x000001>;         /* io space */
+                       interrupt-parent = <&intc3>;
+                       interrupts = <0>;
 
-                               interrupt-parent = <&intc2>;
-                               interrupts = <0>;
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
 
-                               status = "disabled";
-                       };
+                       interrupt-map-mask = <0 0 0 1>;
+                       interrupt-map = <0 0 0 0 &pcie1 0>;
+                       status = "disabled";
                };
 
                usb0: usb@1b000000 {
@@ -288,12 +289,11 @@
 };
 
 &mdio0 {
-       resets = <&rst 22>;
-       reset-names = "mdio";
+       compatible = "qca,ar9340-mdio";
 };
 
 &eth0 {
-       compatible = "qca,qca9550-eth", "syscon", "simple-mfd";
+       compatible = "qca,qca9550-eth", "syscon";
 
        pll-reg = <0 0x28 0>;
        pll-handle = <&pll>;
@@ -301,17 +301,16 @@
        pll-data = <0x16000000 0x00000101 0x00001616>;
        phy-mode = "rgmii";
 
-       resets = <&rst 9>;
-       reset-names = "mac";
+       resets = <&rst 9>, <&rst 22>;
+       reset-names = "mac", "mdio";
 };
 
 &mdio1 {
-       resets = <&rst 23>;
-       reset-names = "mdio";
+       compatible = "qca,ar9340-mdio";
 };
 
 &eth1 {
-       compatible = "qca,qca9550-eth", "syscon", "simple-mfd";
+       compatible = "qca,qca9550-eth", "syscon";
 
        pll-reg = <0 0x48 0>;
        pll-handle = <&pll>;
@@ -319,6 +318,6 @@
        pll-data = <0x16000000 0x00000101 0x00001616>;
        phy-mode = "sgmii";
 
-       resets = <&rst 13>;
-       reset-names = "mac";
+       resets = <&rst 13>, <&rst 23>;
+       reset-names = "mac", "mdio";
 };