Skip to content

Commit ac548ad

Browse files
committed
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
2 parents 30c2a65 + 88cda00 commit ac548ad

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,10 @@
7575

7676
timer {
7777
compatible = "arm,armv8-timer";
78-
interrupts = <GIC_PPI 13
79-
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
80-
<GIC_PPI 14
81-
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
82-
<GIC_PPI 11
83-
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,
84-
<GIC_PPI 10
85-
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
78+
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
79+
<GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
80+
<GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
81+
<GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
8682
};
8783

8884
soc {

0 commit comments

Comments
 (0)