diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 20:47:36 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 20:47:36 (GMT) |
| commit | d20ced23c7a019a9ca6fe69d6d1907bfd8c1a255 (patch) | |
| tree | db74daeac853f0afad8b16817cedf71d7d66b486 /arch/arm64/boot/dts/xilinx/zynqmp.dtsi | |
| parent | 7ccb8e633cfeb7969eba09bbf53346e746bb7f89 (diff) | |
| parent | f2a89d3b2b85b90b05453872aaabfdb412a21a03 (diff) | |
| download | linux-d20ced23c7a019a9ca6fe69d6d1907bfd8c1a255.tar.xz | |
Merge branch 'dt/irq-fix' into fixes
* dt/irq-fix:
arm64: dts: Fix broken architected timer interrupt trigger
Diffstat (limited to 'arch/arm64/boot/dts/xilinx/zynqmp.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index e595f22..3e2e51f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -65,10 +65,10 @@ timer { compatible = "arm,armv8-timer"; interrupt-parent = <&gic>; - interrupts = <1 13 0xf01>, - <1 14 0xf01>, - <1 11 0xf01>, - <1 10 0xf01>; + interrupts = <1 13 0xf08>, + <1 14 0xf08>, + <1 11 0xf08>, + <1 10 0xf08>; }; amba_apu { |