diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:48:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:48:29 +0200 |
| commit | 37179033fc98156ce5cd360ff658da3e1fb01a56 (patch) | |
| tree | 87694304b2850605fb225aac186b6d8cd5072659 /arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | |
| parent | 78dc6663a8c12e9d45e7862e3a2c83c68f4a06cf (diff) | |
| parent | f2a89d3b2b85b90b05453872aaabfdb412a21a03 (diff) | |
| download | blackbird-op-linux-37179033fc98156ce5cd360ff658da3e1fb01a56.tar.gz blackbird-op-linux-37179033fc98156ce5cd360ff658da3e1fb01a56.zip | |
Merge branch 'dt/irq-fix' into next/dt64
* dt/irq-fix:
arm64: dts: Fix broken architected timer interrupt trigger
This resolves a non-obvious conflict between a bugfix from
v4.8 and a cleanup for the exynos7 platform.
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index e6765404bb53..58635f7f4668 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -119,10 +119,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = <1 13 0x1>, /* Physical Secure PPI */ - <1 14 0x1>, /* Physical Non-Secure PPI */ - <1 11 0x1>, /* Virtual PPI */ - <1 10 0x1>; /* Hypervisor PPI */ + interrupts = <1 13 0xf08>, /* Physical Secure PPI */ + <1 14 0xf08>, /* Physical Non-Secure PPI */ + <1 11 0xf08>, /* Virtual PPI */ + <1 10 0xf08>; /* Hypervisor PPI */ }; pmu { |
