Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad0e0e68 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

watchdog: moxart: register restart handler with kernel restart handler 



The kernel now provides an API to trigger a system restart.  Register with
it instead of setting arm_pm_restart.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1a9607a3

drivers/watchdog/moxart_wdt.c

+20 −12
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
#include <linux/module.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/notifier.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#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
@@ -29,17 +29,22 @@ struct moxart_wdt_dev { 
	struct watchdog_device dev;

	void __iomem *base;

	unsigned int clock_frequency;

	struct notifier_block restart_handler;

};



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 int moxart_restart_handle(struct notifier_block *this,

				 unsigned long mode, void *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 = container_of(this,

							 struct moxart_wdt_dev,

							 restart_handler);

	writel(1, moxart_wdt->base + REG_COUNT);

	writel(0x5ab9, moxart_wdt->base + REG_MODE);

	writel(0x03, moxart_wdt->base + REG_ENABLE);



	return NOTIFY_DONE;

}



static int moxart_wdt_stop(struct watchdog_device *wdt_dev)
@@ -136,8 +141,12 @@ static int moxart_wdt_probe(struct platform_device *pdev) 
	if (err)

		return err;



	moxart_restart_ctx = moxart_wdt;

	arm_pm_restart = moxart_wdt_restart;

	moxart_wdt->restart_handler.notifier_call = moxart_restart_handle;

	moxart_wdt->restart_handler.priority = 128;

	err = register_restart_handler(&moxart_wdt->restart_handler);

	if (err)

		dev_err(dev, "cannot register restart notifier (err=%d)\n",

			err);



	dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n",

		moxart_wdt->dev.timeout, nowayout);
@@ -149,9 +158,8 @@ static int moxart_wdt_remove(struct platform_device *pdev) 
{

	struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev);



	arm_pm_restart = NULL;

	unregister_restart_handler(&moxart_wdt->restart_handler);

	moxart_wdt_stop(&moxart_wdt->dev);

	watchdog_unregister_device(&moxart_wdt->dev);



	return 0;

}