Commit ac548add authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents 30c2a658 88cda007
...@@ -75,14 +75,10 @@ psci { ...@@ -75,14 +75,10 @@ psci {
timer { timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>, <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 14 <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>, <GIC_PPI 10 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)>;
}; };
soc { soc {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment