diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2017-03-22 00:05:16 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2017-03-22 09:16:28 +0100 |
| commit | 2e1aa605faddb810b2bd5dac7ed418d898268e40 (patch) | |
| tree | cd5525020f6f5ff6143e05063cfef8ef0b81e718 /arch/arm/boot/dts/rk3188.dtsi | |
| parent | ARM: dts: rockchip: add rk322x dw-mmc resets (diff) | |
| download | linux-2e1aa605faddb810b2bd5dac7ed418d898268e40.tar.xz linux-2e1aa605faddb810b2bd5dac7ed418d898268e40.zip | |
ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs
According to [0] pointed out by Marc Zyngier in a report about a
similar error message, PPIs 11 and 13 are edge triggered on
Cortex-A9 socs including the rk3066 and rk3188 which currently
mark them as level triggered.
Until some time ago the gic did not care but commit 992345a58e0c
("irqchip/gic: WARN if setting the interrupt type for a PPI fails")
introduced a warning for that case.
Fix the warning on these socs by describing the interrupts correctly
and also using the binding constants for easier reading in the future.
[0] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0407f/CCHEIGIC.html
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot/dts/rk3188.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index cf91254d0a43..fa1bdb8875ae 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -529,11 +529,11 @@ }; &global_timer { - interrupts = <GIC_PPI 11 0xf04>; + interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; }; &local_timer { - interrupts = <GIC_PPI 13 0xf04>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; }; &i2c0 { |