Skip to content

L
linux
Commit 78dc6663 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'zynqmp-dt-for-4.9' of https://github.com/Xilinx/linux-xlnx into next/dt64 

Pull "arm64: Xilinx ZynqMP dt patches for v4.9" from Michal Simek:

- Fix gic ranges property
- Use 64bit size cells format
- Add PCIe node
- Correct pmu and watchdog nodes

* tag 'zynqmp-dt-for-4.9' of https://github.com/Xilinx/linux-xlnx:
  ARM64: zynqmp: Correct the watchdog timer interrupt number
  ARM64: zynqmp: Add missing interrupt-parent to PMU node
  ARM64: zynqmp: Add PCIe node
  ARM64: zynqmp: Use 64bit size cell format
  ARM64: zynqmp: Align gic ranges for 64k in device tree
parents 2e1762c3 908c9e73
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 31 deletions
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
View file @ 78dc6663
...@@ -29,7 +29,7 @@ chosen { ...@@ -29,7 +29,7 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x0 0x40000000>; reg = <0x0 0x0 0x0 0x40000000>;
}; };
}; };
......
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
View file @ 78dc6663
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
/ { / {
compatible = "xlnx,zynqmp"; compatible = "xlnx,zynqmp";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <2>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
...@@ -51,6 +51,7 @@ cpu@3 { ...@@ -51,6 +51,7 @@ cpu@3 {
pmu { pmu {
compatible = "arm,armv8-pmuv3"; compatible = "arm,armv8-pmuv3";
interrupt-parent = <&gic>;
interrupts = <0 143 4>, interrupts = <0 143 4>,
<0 144 4>, <0 144 4>,
<0 145 4>, <0 145 4>,
...@@ -75,15 +76,15 @@ amba_apu { ...@@ -75,15 +76,15 @@ amba_apu {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges = <0 0 0 0 0xffffffff>;
gic: interrupt-controller@f9010000 { gic: interrupt-controller@f9010000 {
compatible = "arm,gic-400", "arm,cortex-a15-gic"; compatible = "arm,gic-400", "arm,cortex-a15-gic";
#interrupt-cells = <3>; #interrupt-cells = <3>;
reg = <0x0 0xf9010000 0x10000>, reg = <0x0 0xf9010000 0x10000>,
<0x0 0xf902f000 0x2000>, <0x0 0xf9020000 0x20000>,
<0x0 0xf9040000 0x20000>, <0x0 0xf9040000 0x20000>,
<0x0 0xf906f000 0x2000>; <0x0 0xf9060000 0x20000>;
interrupt-controller; interrupt-controller;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <1 9 0xf04>; interrupts = <1 9 0xf04>;
...@@ -93,14 +94,14 @@ gic: interrupt-controller@f9010000 { ...@@ -93,14 +94,14 @@ gic: interrupt-controller@f9010000 {
amba: amba { amba: amba {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <2>;
ranges; ranges;
can0: can@ff060000 { can0: can@ff060000 {
compatible = "xlnx,zynq-can-1.0"; compatible = "xlnx,zynq-can-1.0";
status = "disabled"; status = "disabled";
clock-names = "can_clk", "pclk"; clock-names = "can_clk", "pclk";
reg = <0x0 0xff060000 0x1000>; reg = <0x0 0xff060000 0x0 0x1000>;
interrupts = <0 23 4>; interrupts = <0 23 4>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
tx-fifo-depth = <0x40>; tx-fifo-depth = <0x40>;
...@@ -111,7 +112,7 @@ can1: can@ff070000 { ...@@ -111,7 +112,7 @@ can1: can@ff070000 {
compatible = "xlnx,zynq-can-1.0"; compatible = "xlnx,zynq-can-1.0";
status = "disabled"; status = "disabled";
clock-names = "can_clk", "pclk"; clock-names = "can_clk", "pclk";
reg = <0x0 0xff070000 0x1000>; reg = <0x0 0xff070000 0x0 0x1000>;
interrupts = <0 24 4>; interrupts = <0 24 4>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
tx-fifo-depth = <0x40>; tx-fifo-depth = <0x40>;
...@@ -123,7 +124,7 @@ gem0: ethernet@ff0b0000 { ...@@ -123,7 +124,7 @@ gem0: ethernet@ff0b0000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 57 4>, <0 57 4>; interrupts = <0 57 4>, <0 57 4>;
reg = <0x0 0xff0b0000 0x1000>; reg = <0x0 0xff0b0000 0x0 0x1000>;
clock-names = "pclk", "hclk", "tx_clk"; clock-names = "pclk", "hclk", "tx_clk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -134,7 +135,7 @@ gem1: ethernet@ff0c0000 { ...@@ -134,7 +135,7 @@ gem1: ethernet@ff0c0000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 59 4>, <0 59 4>; interrupts = <0 59 4>, <0 59 4>;
reg = <0x0 0xff0c0000 0x1000>; reg = <0x0 0xff0c0000 0x0 0x1000>;
clock-names = "pclk", "hclk", "tx_clk"; clock-names = "pclk", "hclk", "tx_clk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -145,7 +146,7 @@ gem2: ethernet@ff0d0000 { ...@@ -145,7 +146,7 @@ gem2: ethernet@ff0d0000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 61 4>, <0 61 4>; interrupts = <0 61 4>, <0 61 4>;
reg = <0x0 0xff0d0000 0x1000>; reg = <0x0 0xff0d0000 0x0 0x1000>;
clock-names = "pclk", "hclk", "tx_clk"; clock-names = "pclk", "hclk", "tx_clk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -156,7 +157,7 @@ gem3: ethernet@ff0e0000 { ...@@ -156,7 +157,7 @@ gem3: ethernet@ff0e0000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 63 4>, <0 63 4>; interrupts = <0 63 4>, <0 63 4>;
reg = <0x0 0xff0e0000 0x1000>; reg = <0x0 0xff0e0000 0x0 0x1000>;
clock-names = "pclk", "hclk", "tx_clk"; clock-names = "pclk", "hclk", "tx_clk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -170,7 +171,7 @@ gpio: gpio@ff0a0000 { ...@@ -170,7 +171,7 @@ gpio: gpio@ff0a0000 {
interrupts = <0 16 4>; interrupts = <0 16 4>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
reg = <0x0 0xff0a0000 0x1000>; reg = <0x0 0xff0a0000 0x0 0x1000>;
}; };
i2c0: i2c@ff020000 { i2c0: i2c@ff020000 {
...@@ -178,7 +179,7 @@ i2c0: i2c@ff020000 { ...@@ -178,7 +179,7 @@ i2c0: i2c@ff020000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 17 4>; interrupts = <0 17 4>;
reg = <0x0 0xff020000 0x1000>; reg = <0x0 0xff020000 0x0 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
}; };
...@@ -188,15 +189,54 @@ i2c1: i2c@ff030000 { ...@@ -188,15 +189,54 @@ i2c1: i2c@ff030000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 18 4>; interrupts = <0 18 4>;
reg = <0x0 0xff030000 0x1000>; reg = <0x0 0xff030000 0x0 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 { sata: ahci@fd0c0000 {
compatible = "ceva,ahci-1v84"; compatible = "ceva,ahci-1v84";
status = "disabled"; status = "disabled";
reg = <0x0 0xfd0c0000 0x2000>; reg = <0x0 0xfd0c0000 0x0 0x2000>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 133 4>; interrupts = <0 133 4>;
}; };
...@@ -206,7 +246,7 @@ sdhci0: sdhci@ff160000 { ...@@ -206,7 +246,7 @@ sdhci0: sdhci@ff160000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 48 4>; interrupts = <0 48 4>;
reg = <0x0 0xff160000 0x1000>; reg = <0x0 0xff160000 0x0 0x1000>;
clock-names = "clk_xin", "clk_ahb"; clock-names = "clk_xin", "clk_ahb";
}; };
...@@ -215,13 +255,13 @@ sdhci1: sdhci@ff170000 { ...@@ -215,13 +255,13 @@ sdhci1: sdhci@ff170000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 49 4>; interrupts = <0 49 4>;
reg = <0x0 0xff170000 0x1000>; reg = <0x0 0xff170000 0x0 0x1000>;
clock-names = "clk_xin", "clk_ahb"; clock-names = "clk_xin", "clk_ahb";
}; };
smmu: smmu@fd800000 { smmu: smmu@fd800000 {
compatible = "arm,mmu-500"; compatible = "arm,mmu-500";
reg = <0x0 0xfd800000 0x20000>; reg = <0x0 0xfd800000 0x0 0x20000>;
#global-interrupts = <1>; #global-interrupts = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 157 4>, interrupts = <0 157 4>,
...@@ -236,7 +276,7 @@ spi0: spi@ff040000 { ...@@ -236,7 +276,7 @@ spi0: spi@ff040000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 19 4>; interrupts = <0 19 4>;
reg = <0x0 0xff040000 0x1000>; reg = <0x0 0xff040000 0x0 0x1000>;
clock-names = "ref_clk", "pclk"; clock-names = "ref_clk", "pclk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -247,7 +287,7 @@ spi1: spi@ff050000 { ...@@ -247,7 +287,7 @@ spi1: spi@ff050000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 20 4>; interrupts = <0 20 4>;
reg = <0x0 0xff050000 0x1000>; reg = <0x0 0xff050000 0x0 0x1000>;
clock-names = "ref_clk", "pclk"; clock-names = "ref_clk", "pclk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -258,7 +298,7 @@ ttc0: timer@ff110000 { ...@@ -258,7 +298,7 @@ ttc0: timer@ff110000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 36 4>, <0 37 4>, <0 38 4>; interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
reg = <0x0 0xff110000 0x1000>; reg = <0x0 0xff110000 0x0 0x1000>;
timer-width = <32>; timer-width = <32>;
}; };
...@@ -267,7 +307,7 @@ ttc1: timer@ff120000 { ...@@ -267,7 +307,7 @@ ttc1: timer@ff120000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 39 4>, <0 40 4>, <0 41 4>; interrupts = <0 39 4>, <0 40 4>, <0 41 4>;
reg = <0x0 0xff120000 0x1000>; reg = <0x0 0xff120000 0x0 0x1000>;
timer-width = <32>; timer-width = <32>;
}; };
...@@ -276,7 +316,7 @@ ttc2: timer@ff130000 { ...@@ -276,7 +316,7 @@ ttc2: timer@ff130000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 42 4>, <0 43 4>, <0 44 4>; interrupts = <0 42 4>, <0 43 4>, <0 44 4>;
reg = <0x0 0xff130000 0x1000>; reg = <0x0 0xff130000 0x0 0x1000>;
timer-width = <32>; timer-width = <32>;
}; };
...@@ -285,7 +325,7 @@ ttc3: timer@ff140000 { ...@@ -285,7 +325,7 @@ ttc3: timer@ff140000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 45 4>, <0 46 4>, <0 47 4>; interrupts = <0 45 4>, <0 46 4>, <0 47 4>;
reg = <0x0 0xff140000 0x1000>; reg = <0x0 0xff140000 0x0 0x1000>;
timer-width = <32>; timer-width = <32>;
}; };
...@@ -294,7 +334,7 @@ uart0: serial@ff000000 { ...@@ -294,7 +334,7 @@ uart0: serial@ff000000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 21 4>; interrupts = <0 21 4>;
reg = <0x0 0xff000000 0x1000>; reg = <0x0 0xff000000 0x0 0x1000>;
clock-names = "uart_clk", "pclk"; clock-names = "uart_clk", "pclk";
}; };
...@@ -303,7 +343,7 @@ uart1: serial@ff010000 { ...@@ -303,7 +343,7 @@ uart1: serial@ff010000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 22 4>; interrupts = <0 22 4>;
reg = <0x0 0xff010000 0x1000>; reg = <0x0 0xff010000 0x0 0x1000>;
clock-names = "uart_clk", "pclk"; clock-names = "uart_clk", "pclk";
}; };
...@@ -312,7 +352,7 @@ usb0: usb@fe200000 { ...@@ -312,7 +352,7 @@ usb0: usb@fe200000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
reg = <0x0 0xfe200000 0x40000>; reg = <0x0 0xfe200000 0x0 0x40000>;
clock-names = "clk_xin", "clk_ahb"; clock-names = "clk_xin", "clk_ahb";
}; };
...@@ -321,7 +361,7 @@ usb1: usb@fe300000 { ...@@ -321,7 +361,7 @@ usb1: usb@fe300000 {
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 70 4>; interrupts = <0 70 4>;
reg = <0x0 0xfe300000 0x40000>; reg = <0x0 0xfe300000 0x0 0x40000>;
clock-names = "clk_xin", "clk_ahb"; clock-names = "clk_xin", "clk_ahb";
}; };
...@@ -329,8 +369,8 @@ watchdog0: watchdog@fd4d0000 { ...@@ -329,8 +369,8 @@ watchdog0: watchdog@fd4d0000 {
compatible = "cdns,wdt-r1p2"; compatible = "cdns,wdt-r1p2";
status = "disabled"; status = "disabled";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 52 1>; interrupts = <0 113 1>;
reg = <0x0 0xfd4d0000 0x1000>; reg = <0x0 0xfd4d0000 0x0 0x1000>;
timeout-sec = <10>; timeout-sec = <10>;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7