From patchwork Sun Jul 6 23:38:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4491721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 73E4B9F36A for ; Sun, 6 Jul 2014 23:41:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4C0C20265 for ; Sun, 6 Jul 2014 23:41:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1478320225 for ; Sun, 6 Jul 2014 23:41:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3w1n-0001ig-Sa; Sun, 06 Jul 2014 23:39:27 +0000 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3w1X-0001Un-Fb for linux-arm-kernel@lists.infradead.org; Sun, 06 Jul 2014 23:39:12 +0000 Received: by mail-pd0-f173.google.com with SMTP id r10so4355604pdi.32 for ; Sun, 06 Jul 2014 16:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=t1+4T0Qj/JXZu4Pfbo6CXmKji79clcuANMmKU/05JVo=; b=yHVUPJd4Rx2kEhxTsl251HaJgMGTmXy8IWO8SYkPkGgmJasM6trWVg2culddTYoqiz GmsszBJCMnfB/yXwX7n7dxQtRGDn5WJaDSUcwdevnpD2WU31k3zlFIjoKybsH1BNKD8M BeaiT3tSPqY0dL3fHai9EfxF1Y2JWmYlN9paOVNcnxlnqZ6ccCkQj21fuDTxsvBdVD8i qYBnwfUe0ivsCoPYE8+ywXFsvEk0Gii5c2F7QO6sI1D06cXY+FFj3NRd+GdbNGb5kcxu U+QX6WuhVkWPyIQWNV7m7WHn7qMNnECE8QIco4f2aKIuHZKMYyIwQe9J9k880r0BLBkv 9/Ag== X-Received: by 10.66.66.140 with SMTP id f12mr25237006pat.78.1404689930662; Sun, 06 Jul 2014 16:38:50 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id qv9sm50666501pbc.71.2014.07.06.16.38.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 06 Jul 2014 16:38:50 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/7] watchdog: moxart: Register restart handler with restart notifier Date: Sun, 6 Jul 2014 16:38:18 -0700 Message-Id: <1404689900-27421-6-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404689900-27421-1-git-send-email-linux@roeck-us.net> References: <1404689900-27421-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140706_163911_605227_8ABADDB5 X-CRM114-Status: GOOD ( 14.56 ) X-Spam-Score: -0.4 (/) Cc: Ingo Molnar , Russell King , Heiko Stuebner , Arnd Bergmann , linux-doc@vger.kernel.org, Dmitry Eremin-Solenikov , Catalin Marinas , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , David Woodhouse , Andrew Morton , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The kernel now provides an API to trigger a system restart. Register with it instead of setting arm_pm_restart. Signed-off-by: Guenter Roeck --- v2: No change drivers/watchdog/moxart_wdt.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 4aa3a8a..aef1121 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -15,12 +15,12 @@ #include #include #include +#include #include +#include #include #include -#include - #define REG_COUNT 0x4 #define REG_MODE 0x8 #define REG_ENABLE 0xC @@ -35,13 +35,20 @@ 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_notify(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); + + return NOTIFY_DONE; } +static struct notifier_block moxart_restart_notifier = { + .notifier_call = moxart_restart_notify, +}; + static int moxart_wdt_stop(struct watchdog_device *wdt_dev) { struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev); @@ -137,7 +144,9 @@ static int moxart_wdt_probe(struct platform_device *pdev) return err; moxart_restart_ctx = moxart_wdt; - arm_pm_restart = moxart_wdt_restart; + err = register_restart_notifier(&moxart_restart_notifier); + if (err) + dev_err(dev, "cannot register reset 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_notifier(&moxart_restart_notifier); moxart_wdt_stop(&moxart_wdt->dev); - watchdog_unregister_device(&moxart_wdt->dev); return 0; }