diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:47:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:47:36 +0200 |
| commit | d20ced23c7a019a9ca6fe69d6d1907bfd8c1a255 (patch) | |
| tree | db74daeac853f0afad8b16817cedf71d7d66b486 /arch/arm64/boot/dts/broadcom | |
| parent | 7ccb8e633cfeb7969eba09bbf53346e746bb7f89 (diff) | |
| parent | f2a89d3b2b85b90b05453872aaabfdb412a21a03 (diff) | |
Merge branch 'dt/irq-fix' into fixes
* dt/irq-fix:
arm64: dts: Fix broken architected timer interrupt trigger
Diffstat (limited to 'arch/arm64/boot/dts/broadcom')
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/ns2.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi index f53b0955bfd3..d4a12fad8afd 100644 --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi @@ -88,13 +88,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xff) | - IRQ_TYPE_EDGE_RISING)>, + IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 14 (GIC_CPU_MASK_RAW(0xff) | - IRQ_TYPE_EDGE_RISING)>, + IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 11 (GIC_CPU_MASK_RAW(0xff) | - IRQ_TYPE_EDGE_RISING)>, + IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 10 (GIC_CPU_MASK_RAW(0xff) | - IRQ_TYPE_EDGE_RISING)>; + IRQ_TYPE_LEVEL_LOW)>; }; pmu { |