Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / arch / arm / dts / uniphier-ld20.dtsi

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 59e4191..5e7143e 100644 (file)
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -234,6 +234,8 @@
                        compatible = "socionext,uniphier-scssi";
                        status = "disabled";
                        reg = <0x54006000 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 39 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi0>;
@@ -245,33 +247,39 @@
                        compatible = "socionext,uniphier-scssi";
                        status = "disabled";
                        reg = <0x54006100 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 216 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi1>;
-                       clocks = <&peri_clk 11>;
-                       resets = <&peri_rst 11>;
+                       clocks = <&peri_clk 12>;
+                       resets = <&peri_rst 12>;
                };
 
                spi2: spi@54006200 {
                        compatible = "socionext,uniphier-scssi";
                        status = "disabled";
                        reg = <0x54006200 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 229 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi2>;
-                       clocks = <&peri_clk 11>;
-                       resets = <&peri_rst 11>;
+                       clocks = <&peri_clk 13>;
+                       resets = <&peri_rst 13>;
                };
 
                spi3: spi@54006300 {
                        compatible = "socionext,uniphier-scssi";
                        status = "disabled";
                        reg = <0x54006300 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 230 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi3>;
-                       clocks = <&peri_clk 11>;
-                       resets = <&peri_rst 11>;
+                       clocks = <&peri_clk 14>;
+                       resets = <&peri_rst 14>;
                };
 
                serial0: serial@54006800 {
@@ -664,6 +672,14 @@
                        };
                };
 
+               xdmac: dma-controller@5fc10000 {
+                       compatible = "socionext,uniphier-xdmac";
+                       reg = <0x5fc10000 0x5300>;
+                       interrupts = <0 188 4>;
+                       dma-channels = <16>;
+                       #dma-cells = <2>;
+               };
+
                aidet: interrupt-controller@5fc20000 {
                        compatible = "socionext,uniphier-ld20-aidet";
                        reg = <0x5fc20000 0x200>;
@@ -939,7 +955,9 @@
                        compatible = "socionext,uniphier-ld20-pcie-phy";
                        reg = <0x66038000 0x4000>;
                        #phy-cells = <0>;
+                       clock-names = "link";
                        clocks = <&sys_clk 24>;
+                       reset-names = "link";
                        resets = <&sys_rst 24>;
                        socionext,syscon = <&soc_glue>;
                };