Skip to contentSkip to conversation

ARM: dts: rockchip: fix rk3288 watchdog irq

PATCH New Heiko Stuebner 2 participants 3 messages Jun 19, 2015 – Jun 22, 2015

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH 1/1 ARM: dts: rockchip: fix rk3288 watchdog irq

The watchdog irq is actually SPI 79, which translates to the original 111 in the manual where the SPI irqs start at 32.
The current dw_wdt driver does not use the irq at all, so this issue never surfaced. Nevertheless fix this for a time we want to use the irq.

Fixes 2ab557b72d46 ("ARM: dts: rockchip: add core rk3288 dtsi")
Signed-off-by Heiko Stuebner <[email protected]>

---
Found while verifying the data for the quite similar rk3368 arm64 soc.

 arch/arm/boot/dts/rk3288.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3288.dtsi +1 -1
index 22316d0..858efd0 100644
@@ -626,7 +626,7 @@
 		compatible = "rockchip,rk3288-wdt", "snps,dw-wdt";
 		reg = <0xff800000 0x100>;
 		clocks = <&cru PCLK_WDT>;
-		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 ARM: dts: rockchip: fix rk3288 watchdog irq

Heiko,

Quoted 5 lines · Heiko Stuebner

The watchdog irq is actually SPI 79, which translates to the original 111 in the manual where the SPI irqs start at 32.
The current dw_wdt driver does not use the irq at all, so this issue never surfaced. Nevertheless fix this for a time we want to use the irq.

Quoted 7 lines
Fixes 2ab557b72d46 ("ARM: dts: rockchip: add core rk3288 dtsi")
Signed-off-by Heiko Stuebner <[email protected]>

---
Found while verifying the data for the quite similar rk3368 arm64 soc.

 arch/arm/boot/dts/rk3288.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

* gpio0 shows up in TRM as 113
* gpio0 is in dts as SPI 81
* wdt shows up in TRM as 111
* so wdt should be in dts as SPI 79

...so yup.

Reviewed-by Douglas Anderson <[email protected]>
author maintainer Applied
#2 lore raw

PATCH 1/1 ARM: dts: rockchip: fix rk3288 watchdog irq

In reply to Heiko Stuebner

Am Freitag, 19. Juni 2015, 16:31:14 schrieb Heiko Stuebner:

Quoted 7 lines

The watchdog irq is actually SPI 79, which translates to the original 111 in the manual where the SPI irqs start at 32.
The current dw_wdt driver does not use the irq at all, so this issue never surfaced. Nevertheless fix this for a time we want to use the irq.

Fixes 2ab557b72d46 ("ARM: dts: rockchip: add core rk3288 dtsi")
Signed-off-by Heiko Stuebner <[email protected]>

applied to dts changes for 4.3