Patch "ARM: dts: rockchip: fix rk3288 watchdog irq" has been added to the 4.2-stable tree

Patch "ARM: dts: rockchip: fix rk3288 watchdog irq" has been added to the 4.2-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ARM: dts: rockchip: fix rk3288 watchdog irq

to the 4.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-dts-rockchip-fix-rk3288-watchdog-irq.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 1a1b698b115467242303daf5fe1d3c9886c2fa17 Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko@sntech.de>
Date: Fri, 19 Jun 2015 16:31:14 +0200
Subject: ARM: dts: rockchip: fix rk3288 watchdog irq

From: Heiko Stuebner <heiko@sntech.de>

commit 1a1b698b115467242303daf5fe1d3c9886c2fa17 upstream.

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>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- 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";
 	};
 


Patches currently in stable-queue which might be from heiko@sntech.de are

queue-4.2/arm-dts-rockchip-fix-rk3288-watchdog-irq.patch
queue-4.2/clk-rockchip-rk3288-add-clk_set_rate_parent-to-sclk_mac.patch
queue-4.2/arm-rockchip-fix-the-cpu-soft-reset.patch