summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-07-03 16:44:57 +0200
committerArnd Bergmann <arnd@arndb.de>2017-07-03 16:44:57 +0200
commitac548add22a7916b3f38bd46b73bccf0ba6ca4cf (patch)
tree24241c3de5f3481512840356fe08a6f1b1047cde /arch/arm64
parent30c2a6582869055132fb59fb28624d6703d202fe (diff)
parent88cda00733f0731711c76e535d4972c296ac512e (diff)
Merge tag 'mvebu-dt64-4.13-3' of git://git.infradead.org/linux-mvebu into next/dt64
Pull "late dt64 for 4.13" from Gregory CLEMENT: It is actually a patch that missed the end of the 4.12 merge window. The patch itself fix a bogus definition of the timer for the Armada 37xx SoCs. * tag 'mvebu-dt64-4.13-3' of git://git.infradead.org/linux-mvebu: ARM64: dts: marvell: armada37xx: Fix timer interrupt specifiers
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index b4d27857c61b..dbcc3d4e2ed5 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -75,14 +75,10 @@
timer {
compatible = "arm,armv8-timer";
- interrupts = <GIC_PPI 13
- (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
- <GIC_PPI 14
- (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
- <GIC_PPI 11
- (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
- <GIC_PPI 10
- (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+ interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
};
soc {