From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754085AbaDWPFd (ORCPT ); Wed, 23 Apr 2014 11:05:33 -0400 Received: from top.free-electrons.com ([176.31.233.9]:58559 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753034AbaDWPFZ (ORCPT ); Wed, 23 Apr 2014 11:05:25 -0400 From: Maxime Ripard To: Arnd Bergmann , wim@iguana.be, dbaryshkov@gmail.com, dwmw2@infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-sunxi@googlegroups.com, Maxime Ripard Subject: [PATCH 1/5] wdt: sunxi: Move restart code to the watchdog driver Date: Wed, 23 Apr 2014 17:04:32 +0200 Message-Id: <1398265476-29373-2-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398265476-29373-1-git-send-email-maxime.ripard@free-electrons.com> References: <1398265476-29373-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Most of the watchdog code is duplicated between the machine restart code and the watchdog driver. Add the restart hook to the watchdog driver, to be able to remove it from the machine code eventually. Signed-off-by: Maxime Ripard --- drivers/watchdog/sunxi_wdt.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index cd00a7836cdc..0644c45d2b60 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include @@ -22,9 +23,12 @@ #include #include #include +#include #include #include +#include + #define WDT_MAX_TIMEOUT 16 #define WDT_MIN_TIMEOUT 1 #define WDT_MODE_TIMEOUT(n) ((n) << 3) @@ -70,6 +74,30 @@ static const int wdt_timeout_map[] = { [16] = 0b1011, /* 16s */ }; +static struct sunxi_wdt_dev *sunxi_restart_ctx; + +static void sun4i_wdt_restart(enum reboot_mode mode, const char *cmd) +{ + if (!sunxi_restart_ctx) + return; + + /* Enable timer and set reset bit in the watchdog */ + writel(WDT_MODE_EN | WDT_MODE_RST_EN, + sunxi_restart_ctx->wdt_base + WDT_MODE); + + /* + * Restart the watchdog. The default (and lowest) interval + * value for the watchdog is 0.5s. + */ + writel(WDT_CTRL_RELOAD, sunxi_restart_ctx->wdt_base + WDT_CTRL); + + while (1) { + mdelay(5); + writel(WDT_MODE_EN | WDT_MODE_RST_EN, + sunxi_restart_ctx->wdt_base + WDT_MODE); + } +} + static int sunxi_wdt_ping(struct watchdog_device *wdt_dev) { struct sunxi_wdt_dev *sunxi_wdt = watchdog_get_drvdata(wdt_dev); @@ -181,6 +209,9 @@ static int sunxi_wdt_probe(struct platform_device *pdev) if (unlikely(err)) return err; + sunxi_restart_ctx = sunxi_wdt; + arm_pm_restart = sun4i_wdt_restart; + dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)", sunxi_wdt->wdt_dev.timeout, nowayout); @@ -191,6 +222,8 @@ static int sunxi_wdt_remove(struct platform_device *pdev) { struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev); + arm_pm_restart = NULL; + watchdog_unregister_device(&sunxi_wdt->wdt_dev); watchdog_set_drvdata(&sunxi_wdt->wdt_dev, NULL); -- 1.9.1