From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756343Ab1GGM0H (ORCPT ); Thu, 7 Jul 2011 08:26:07 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:62456 "EHLO mail-fx0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756249Ab1GGMZx (ORCPT ); Thu, 7 Jul 2011 08:25:53 -0400 From: Vitaly Kuzmichev To: linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Russell King , Arnd Bergmann , Wim Van Sebroeck , Marc Zyngier , Colin Cross Cc: linux-kernel@vger.kernel.org, Vitaly Kuzmichev Subject: [PATCH V3 4/4] ARM: mpcore_wdt: Fix timer mode setup Date: Thu, 7 Jul 2011 16:23:16 +0400 Message-Id: <1310041396-2461-4-git-send-email-vkuzmichev@mvista.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1310041339-2348-1-git-send-email-vkuzmichev@mvista.com> References: <1310041339-2348-1-git-send-email-vkuzmichev@mvista.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow watchdog to set its iterrupt as pending when it is configured for timer mode (in other words, allow emitting interrupt). Also add macros for all Watchdog Control Register flags. Signed-off-by: Vitaly Kuzmichev --- arch/arm/include/asm/smp_twd.h | 6 ++++++ drivers/watchdog/mpcore_wdt.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h index 38130b1..42d4557 100644 --- a/arch/arm/include/asm/smp_twd.h +++ b/arch/arm/include/asm/smp_twd.h @@ -18,6 +18,12 @@ #define TWD_TIMER_CONTROL_PERIODIC (1 << 1) #define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2) +#define TWD_WDOG_CONTROL_ENABLE (1 << 0) +#define TWD_WDOG_CONTROL_PERIODIC (1 << 1) +#define TWD_WDOG_CONTROL_IT_ENABLE (1 << 2) +#define TWD_WDOG_CONTROL_TIMER_MODE (0 << 3) +#define TWD_WDOG_CONTROL_WATCHDOG_MODE (1 << 3) + struct clock_event_device; extern void __iomem *twd_base; diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index f99e49e..23bafb1 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c @@ -118,18 +118,25 @@ static void mpcore_wdt_stop(struct mpcore_wdt *wdt) static void mpcore_wdt_start(struct mpcore_wdt *wdt) { + u32 mode; + dev_printk(KERN_INFO, wdt->dev, "enabling watchdog.\n"); /* This loads the count register but does NOT start the count yet */ mpcore_wdt_keepalive(wdt); + /* Setup watchdog - prescale=256, enable=1 */ + mode = (255 << 8) | TWD_WDOG_CONTROL_ENABLE; + if (mpcore_noboot) { - /* Enable watchdog - prescale=256, watchdog mode=0, enable=1 */ - writel(0x0000FF01, wdt->base + TWD_WDOG_CONTROL); + /* timer mode, send interrupt */ + mode |= TWD_WDOG_CONTROL_TIMER_MODE | + TWD_WDOG_CONTROL_IT_ENABLE; } else { - /* Enable watchdog - prescale=256, watchdog mode=1, enable=1 */ - writel(0x0000FF09, wdt->base + TWD_WDOG_CONTROL); + /* watchdog mode */ + mode |= TWD_WDOG_CONTROL_WATCHDOG_MODE; } + writel(mode, wdt->base + TWD_WDOG_CONTROL); } static int mpcore_wdt_set_heartbeat(int t) -- 1.7.3.4