ath79: move ath79-clk.h include to ath79.dtsi

[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 c7b6d6e7479d78140d1986d47801f66f2d3f2b94..6489efbf0b0201f64c7cb61aa8000f094f70f4af 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include <dt-bindings/clock/ath79-clk.h>
+
 #include "ath79.dtsi"
 
 / {
@@ -8,6 +8,10 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -71,7 +75,7 @@
                        pinmux: pinmux@1804002c {
                                compatible = "pinctrl-single";
 
-                               reg = <0x1804002c 0x40>;
+                               reg = <0x1804002c 0x44>;
 
                                #size-cells = <0>;
 
@@ -107,22 +111,23 @@
 
                        rst: reset-controller@1806001c {
                                compatible = "qca,qca9560-reset",
-                                               "qca,ar7100-reset",
-                                                "simple-bus";
+                                               "qca,ar7100-reset";
                                reg = <0x1806001c 0x4>;
 
                                #reset-cells = <1>;
                                interrupt-parent = <&cpuintc>;
 
-                               intc3: interrupt-controller@3 {
-                                       compatible = "qcom,qca9556-intc";
+                               intc3: interrupt-controller {
+                                       compatible = "qca,ar9340-intc";
 
+                                       interrupt-parent = <&cpuintc>;
                                        interrupts = <3>;
 
                                        interrupt-controller;
                                        #interrupt-cells = <1>;
 
-                                       qcom,pending-bits = <0x1f000>,          /* pcie rc */
+                                       qca,int-status-addr = <0xac>;
+                                       qca,pending-bits = <0x1f000>,           /* pcie rc */
                                                            <0x1000000>,        /* usb1 */
                                                            <0x10000000>;       /* usb2 */
                                };
@@ -136,38 +141,46 @@
 
                                #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";
-                       };
+                       resets = <&rst 6>, <&rst 7>;
+                       reset-names = "hc", "phy";
+
+                       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 {
@@ -209,11 +222,10 @@
                };
 
                spi: spi@1f000000 {
-                       compatible = "qca,qca9560-spi", "qca,ar7100-spi";
-                       reg = <0x1f000000 0x10>;
+                       compatible = "qca,ar934x-spi";
+                       reg = <0x1f000000 0x1c>;
 
                        clocks = <&pll ATH79_CLK_AHB>;
-                       clock-names = "ahb";
 
                        status = "disabled";
 
@@ -257,16 +269,40 @@
        pll-reg = <0 0x48 0>;
        pll-handle = <&pll>;
 
-       phy-mode = "sgmii";
-
        resets = <&rst 9>;
        reset-names = "mac";
 };
 
 &mdio1 {
+       status = "okay";
        resets = <&rst 23>;
        reset-names = "mdio";
        builtin-switch;
+
+       builtin_switch: switch0@1f {
+               compatible = "qca,ar8229";
+               reg = <0x1f>;
+               resets = <&rst 8>;
+               reset-names = "switch";
+               phy-mode = "gmii";
+               qca,phy4-mii-enable;
+               qca,mib-poll-interval = <500>;
+
+               mdio-bus {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       swphy0: ethernet-phy@0 {
+                               reg = <0>;
+                               phy-mode = "mii";
+                       };
+
+                       swphy4: ethernet-phy@4 {
+                               reg = <4>;
+                               phy-mode = "mii";
+                       };
+               };
+       };
 };
 
 &eth1 {
@@ -277,5 +313,8 @@
        resets = <&rst 13>;
        reset-names = "mac";
 
-       status = "disabled";
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
 };