summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/socionext
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-14 22:48:29 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-14 22:48:29 +0200
commit37179033fc98156ce5cd360ff658da3e1fb01a56 (patch)
tree87694304b2850605fb225aac186b6d8cd5072659 /arch/arm64/boot/dts/socionext
parent78dc6663a8c12e9d45e7862e3a2c83c68f4a06cf (diff)
parentf2a89d3b2b85b90b05453872aaabfdb412a21a03 (diff)
downloadlinux-stable-37179033fc98156ce5cd360ff658da3e1fb01a56.tar.gz
linux-stable-37179033fc98156ce5cd360ff658da3e1fb01a56.tar.bz2
linux-stable-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/socionext')
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 9cebe811b27c..08fd7cf7769c 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -118,10 +118,10 @@
timer {
compatible = "arm,armv8-timer";
- interrupts = <1 13 0xf01>,
- <1 14 0xf01>,
- <1 11 0xf01>,
- <1 10 0xf01>;
+ interrupts = <1 13 4>,
+ <1 14 4>,
+ <1 11 4>,
+ <1 10 4>;
};
soc {