From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755634AbaEAPmH (ORCPT ); Thu, 1 May 2014 11:42:07 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:62358 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbaEAPmB (ORCPT ); Thu, 1 May 2014 11:42:01 -0400 From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Wim Van Sebroeck , Catalin Marinas , Maxime Ripard , Will Deacon , Arnd Bergmann , Russell King , Jonas Jensen , linux-kernel@vger.kernel.org, Guenter Roeck Subject: [RFC PATCH 4/5] watchdog: moxart: Register reboot handler with watchdog subsystem Date: Thu, 1 May 2014 08:41:32 -0700 Message-Id: <1398958893-30049-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1398958893-30049-1-git-send-email-linux@roeck-us.net> References: <1398958893-30049-1-git-send-email-linux@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The watchdog subsystem now provides an API to trigger a system reboot. Register with it. Signed-off-by: Guenter Roeck --- drivers/watchdog/moxart_wdt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 4aa3a8a..b83646b 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -19,8 +19,6 @@ #include #include -#include - #define REG_COUNT 0x4 #define REG_MODE 0x8 #define REG_ENABLE 0xC @@ -31,15 +29,16 @@ struct moxart_wdt_dev { unsigned int clock_frequency; }; -static struct moxart_wdt_dev *moxart_restart_ctx; - static int heartbeat; -static void moxart_wdt_restart(enum reboot_mode reboot_mode, const char *cmd) +static void moxart_wdt_reboot(struct watchdog_device *wdt_dev, + enum reboot_mode mode, const char *cmd) { - writel(1, moxart_restart_ctx->base + REG_COUNT); - writel(0x5ab9, moxart_restart_ctx->base + REG_MODE); - writel(0x03, moxart_restart_ctx->base + REG_ENABLE); + struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev); + + writel(1, moxart_wdt->base + REG_COUNT); + writel(0x5ab9, moxart_wdt->base + REG_MODE); + writel(0x03, moxart_wdt->base + REG_ENABLE); } static int moxart_wdt_stop(struct watchdog_device *wdt_dev) @@ -81,6 +80,7 @@ static const struct watchdog_ops moxart_wdt_ops = { .owner = THIS_MODULE, .start = moxart_wdt_start, .stop = moxart_wdt_stop, + .reboot = moxart_wdt_reboot, .set_timeout = moxart_wdt_set_timeout, }; @@ -136,9 +136,6 @@ static int moxart_wdt_probe(struct platform_device *pdev) if (err) return err; - moxart_restart_ctx = moxart_wdt; - arm_pm_restart = moxart_wdt_restart; - dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n", moxart_wdt->dev.timeout, nowayout); @@ -149,7 +146,6 @@ static int moxart_wdt_remove(struct platform_device *pdev) { struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev); - arm_pm_restart = NULL; moxart_wdt_stop(&moxart_wdt->dev); watchdog_unregister_device(&moxart_wdt->dev); -- 1.7.9.7