[PATCH v3 5/6] watchdog: moxart: Register reboot handler with watchdog subsystem
From: linux@roeck-us.net (Guenter Roeck)
Date: 2014-05-15 20:38:59
Also in:
linux-watchdog, lkml
Subsystem:
the rest, watchdog device drivers · Maintainers:
Linus Torvalds, Wim Van Sebroeck, Guenter Roeck
The watchdog subsystem now provides an API to trigger a system reboot. Register with it. Tested-by: Jonas Jensen <redacted> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v3: Drop reboot mode and cmd string parameters from API v2: No change drivers/watchdog/moxart_wdt.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
index 4aa3a8a..9698c83 100644
--- a/drivers/watchdog/moxart_wdt.c
+++ b/drivers/watchdog/moxart_wdt.c@@ -19,8 +19,6 @@ #include <linux/watchdog.h> #include <linux/moduleparam.h> -#include <asm/system_misc.h> - #define REG_COUNT 0x4 #define REG_MODE 0x8 #define REG_ENABLE 0xC
@@ -31,15 +29,15 @@ 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) { - 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 +79,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 +135,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 +145,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.9.1