From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45274 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754915AbbISE7s (ORCPT ); Sat, 19 Sep 2015 00:59:48 -0400 Subject: Patch "ARM: dts: rockchip: fix rk3288 watchdog irq" has been added to the 4.1-stable tree To: heiko@sntech.de, dianders@chromium.org, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 18 Sep 2015 20:33:52 -0700 Message-ID: <14426336324810@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.1-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.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 1a1b698b115467242303daf5fe1d3c9886c2fa17 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 19 Jun 2015 16:31:14 +0200 Subject: ARM: dts: rockchip: fix rk3288 watchdog irq From: Heiko Stuebner 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 Reviewed-by: Douglas Anderson Signed-off-by: Greg Kroah-Hartman --- 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 @@ -584,7 +584,7 @@ compatible = "rockchip,rk3288-wdt", "snps,dw-wdt"; reg = <0xff800000 0x100>; clocks = <&cru PCLK_WDT>; - interrupts = ; + interrupts = ; status = "disabled"; }; Patches currently in stable-queue which might be from heiko@sntech.de are queue-4.1/arm-dts-rockchip-fix-rk3288-watchdog-irq.patch queue-4.1/clk-rockchip-rk3288-add-clk_set_rate_parent-to-sclk_mac.patch queue-4.1/arm-rockchip-fix-the-cpu-soft-reset.patch