Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm64 / boot / dts / xilinx / zynqmp.dtsi

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 3e2e51f..68a9083 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -14,7 +14,7 @@
 / {
        compatible = "xlnx,zynqmp";
        #address-cells = <2>;
-       #size-cells = <1>;
+       #size-cells = <2>;
 
        cpus {
                #address-cells = <1>;
@@ -51,6 +51,7 @@
 
        pmu {
                compatible = "arm,armv8-pmuv3";
+               interrupt-parent = <&gic>;
                interrupts = <0 143 4>,
                             <0 144 4>,
                             <0 145 4>,
@@ -75,15 +76,15 @@
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;
-               ranges;
+               ranges = <0 0 0 0 0xffffffff>;
 
                gic: interrupt-controller@f9010000 {
                        compatible = "arm,gic-400", "arm,cortex-a15-gic";
                        #interrupt-cells = <3>;
                        reg = <0x0 0xf9010000 0x10000>,
-                             <0x0 0xf902f000 0x2000>,
+                             <0x0 0xf9020000 0x20000>,
                              <0x0 0xf9040000 0x20000>,
-                             <0x0 0xf906f000 0x2000>;
+                             <0x0 0xf9060000 0x20000>;
                        interrupt-controller;
                        interrupt-parent = <&gic>;
                        interrupts = <1 9 0xf04>;
@@ -93,14 +94,14 @@
        amba: amba {
                compatible = "simple-bus";
                #address-cells = <2>;
-               #size-cells = <1>;
+               #size-cells = <2>;
                ranges;
 
                can0: can@ff060000 {
                        compatible = "xlnx,zynq-can-1.0";
                        status = "disabled";
                        clock-names = "can_clk", "pclk";
-                       reg = <0x0 0xff060000 0x1000>;
+                       reg = <0x0 0xff060000 0x0 0x1000>;
                        interrupts = <0 23 4>;
                        interrupt-parent = <&gic>;
                        tx-fifo-depth = <0x40>;
@@ -111,7 +112,7 @@
                        compatible = "xlnx,zynq-can-1.0";
                        status = "disabled";
                        clock-names = "can_clk", "pclk";
-                       reg = <0x0 0xff070000 0x1000>;
+                       reg = <0x0 0xff070000 0x0 0x1000>;
                        interrupts = <0 24 4>;
                        interrupt-parent = <&gic>;
                        tx-fifo-depth = <0x40>;
@@ -123,7 +124,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 57 4>, <0 57 4>;
-                       reg = <0x0 0xff0b0000 0x1000>;
+                       reg = <0x0 0xff0b0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -134,7 +135,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 59 4>, <0 59 4>;
-                       reg = <0x0 0xff0c0000 0x1000>;
+                       reg = <0x0 0xff0c0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -145,7 +146,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 61 4>, <0 61 4>;
-                       reg = <0x0 0xff0d0000 0x1000>;
+                       reg = <0x0 0xff0d0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -156,7 +157,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 63 4>, <0 63 4>;
-                       reg = <0x0 0xff0e0000 0x1000>;
+                       reg = <0x0 0xff0e0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -170,7 +171,7 @@
                        interrupts = <0 16 4>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
-                       reg = <0x0 0xff0a0000 0x1000>;
+                       reg = <0x0 0xff0a0000 0x0 0x1000>;
                };
 
                i2c0: i2c@ff020000 {
@@ -178,7 +179,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 17 4>;
-                       reg = <0x0 0xff020000 0x1000>;
+                       reg = <0x0 0xff020000 0x0 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
@@ -188,15 +189,54 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 18 4>;
-                       reg = <0x0 0xff030000 0x1000>;
+                       reg = <0x0 0xff030000 0x0 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
 
+               pcie: pcie@fd0e0000 {
+                       compatible = "xlnx,nwl-pcie-2.11";
+                       status = "disabled";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       msi-controller;
+                       device_type = "pci";
+                       interrupt-parent = <&gic>;
+                       interrupts = <0 118 4>,
+                                   <0 117 4>,
+                                   <0 116 4>,
+                                   <0 115 4>,  /* MSI_1 [63...32] */
+                                   <0 114 4>;  /* MSI_0 [31...0] */
+                       interrupt-names = "misc", "dummy", "intx",
+                                         "msi1", "msi0";
+                       msi-parent = <&pcie>;
+                       reg = <0x0 0xfd0e0000 0x0 0x1000>,
+                             <0x0 0xfd480000 0x0 0x1000>,
+                             <0x80 0x00000000 0x0 0x1000000>;
+                       reg-names = "breg", "pcireg", "cfg";
+                       ranges = <0x02000000 0x00000000 0xe0000000 0x00000000
+                                 0xe0000000 0x00000000 0x10000000
+                                 /* non-prefetchable memory */
+                                 0x43000000 0x00000006 0x00000000 0x00000006
+                                 0x00000000 0x00000002 0x00000000>;
+                                 /* prefetchable memory */
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
+                       interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>,
+                                       <0x0 0x0 0x0 0x2 &pcie_intc 0x2>,
+                                       <0x0 0x0 0x0 0x3 &pcie_intc 0x3>,
+                                       <0x0 0x0 0x0 0x4 &pcie_intc 0x4>;
+                       pcie_intc: legacy-interrupt-controller {
+                               interrupt-controller;
+                               #address-cells = <0>;
+                               #interrupt-cells = <1>;
+                       };
+               };
+
                sata: ahci@fd0c0000 {
                        compatible = "ceva,ahci-1v84";
                        status = "disabled";
-                       reg = <0x0 0xfd0c0000 0x2000>;
+                       reg = <0x0 0xfd0c0000 0x0 0x2000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 133 4>;
                };
@@ -206,7 +246,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 48 4>;
-                       reg = <0x0 0xff160000 0x1000>;
+                       reg = <0x0 0xff160000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";
                };
 
@@ -215,13 +255,13 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 49 4>;
-                       reg = <0x0 0xff170000 0x1000>;
+                       reg = <0x0 0xff170000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";
                };
 
                smmu: smmu@fd800000 {
                        compatible = "arm,mmu-500";
-                       reg = <0x0 0xfd800000 0x20000>;
+                       reg = <0x0 0xfd800000 0x0 0x20000>;
                        #global-interrupts = <1>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 157 4>,
@@ -236,7 +276,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 19 4>;
-                       reg = <0x0 0xff040000 0x1000>;
+                       reg = <0x0 0xff040000 0x0 0x1000>;
                        clock-names = "ref_clk", "pclk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -247,7 +287,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 20 4>;
-                       reg = <0x0 0xff050000 0x1000>;
+                       reg = <0x0 0xff050000 0x0 0x1000>;
                        clock-names = "ref_clk", "pclk";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -258,7 +298,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
-                       reg = <0x0 0xff110000 0x1000>;
+                       reg = <0x0 0xff110000 0x0 0x1000>;
                        timer-width = <32>;
                };
 
@@ -267,7 +307,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 39 4>, <0 40 4>, <0 41 4>;
-                       reg = <0x0 0xff120000 0x1000>;
+                       reg = <0x0 0xff120000 0x0 0x1000>;
                        timer-width = <32>;
                };
 
@@ -276,7 +316,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 42 4>, <0 43 4>, <0 44 4>;
-                       reg = <0x0 0xff130000 0x1000>;
+                       reg = <0x0 0xff130000 0x0 0x1000>;
                        timer-width = <32>;
                };
 
@@ -285,7 +325,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 45 4>, <0 46 4>, <0 47 4>;
-                       reg = <0x0 0xff140000 0x1000>;
+                       reg = <0x0 0xff140000 0x0 0x1000>;
                        timer-width = <32>;
                };
 
@@ -294,7 +334,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 21 4>;
-                       reg = <0x0 0xff000000 0x1000>;
+                       reg = <0x0 0xff000000 0x0 0x1000>;
                        clock-names = "uart_clk", "pclk";
                };
 
@@ -303,7 +343,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 22 4>;
-                       reg = <0x0 0xff010000 0x1000>;
+                       reg = <0x0 0xff010000 0x0 0x1000>;
                        clock-names = "uart_clk", "pclk";
                };
 
@@ -312,7 +352,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 65 4>;
-                       reg = <0x0 0xfe200000 0x40000>;
+                       reg = <0x0 0xfe200000 0x0 0x40000>;
                        clock-names = "clk_xin", "clk_ahb";
                };
 
@@ -321,7 +361,7 @@
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 70 4>;
-                       reg = <0x0 0xfe300000 0x40000>;
+                       reg = <0x0 0xfe300000 0x0 0x40000>;
                        clock-names = "clk_xin", "clk_ahb";
                };
 
@@ -329,8 +369,8 @@
                        compatible = "cdns,wdt-r1p2";
                        status = "disabled";
                        interrupt-parent = <&gic>;
-                       interrupts = <0 52 1>;
-                       reg = <0x0 0xfd4d0000 0x1000>;
+                       interrupts = <0 113 1>;
+                       reg = <0x0 0xfd4d0000 0x0 0x1000>;
                        timeout-sec = <10>;
                };
        };