ARM: dts: rockchip: fix rk3288 watchdog irq
diff mbox

Message ID 1961157.dsytR1KvKa@phil
State New
Headers show

Commit Message

Heiko Stuebner June 19, 2015, 2:31 p.m. UTC
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 <heiko@sntech.de>
---
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(-)

Comments

Douglas Anderson June 19, 2015, 3:24 p.m. UTC | #1
Heiko,

On Fri, Jun 19, 2015 at 7:31 AM, Heiko Stuebner <heiko@sntech.de> wrote:
> 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 <heiko@sntech.de>
> ---
> 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 <dianders@chromium.org>
Heiko Stuebner June 22, 2015, 2:38 p.m. UTC | #2
Am Freitag, 19. Juni 2015, 16:31:14 schrieb 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.
> 
> Fixes: 2ab557b72d46 ("ARM: dts: rockchip: add core rk3288 dtsi")
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>

applied to dts changes for 4.3

Patch
diff mbox

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 22316d0..858efd0 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -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";
 	};