From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755628AbcIVHEu (ORCPT ); Thu, 22 Sep 2016 03:04:50 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:33349 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753937AbcIVHEn (ORCPT ); Thu, 22 Sep 2016 03:04:43 -0400 From: Steffen Trumtrar To: linux-watchdog@vger.kernel.org Cc: kernel@pengutronix.de, Steffen Trumtrar , Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] watchdog: dw_wdt: add stop watchdog operation Date: Thu, 22 Sep 2016 09:02:32 +0200 Message-Id: <1474527753-22194-4-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1474527753-22194-1-git-send-email-s.trumtrar@pengutronix.de> References: <1474527753-22194-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only way of stopping the watchdog is by resetting it. Add the watchdog op for stopping the device and reset if a reset line is provided. Signed-off-by: Steffen Trumtrar Cc: Wim Van Sebroeck Cc: Guenter Roeck Cc: linux-watchdog@vger.kernel.org --- drivers/watchdog/dw_wdt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index e024722e8b3b..5b067984d5e8 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -137,6 +137,21 @@ static int dw_wdt_start(struct watchdog_device *wdd) return 0; } +static int dw_wdt_stop(struct watchdog_device *wdd) +{ + struct dw_wdt *dw_wdt = to_dw_wdt(wdd); + + if (IS_ERR(dw_wdt->rst)) { + dev_warn(wdd->parent, "No reset line. Will not stop.\n"); + return PTR_ERR(dw_wdt->rst); + } + + reset_control_assert(dw_wdt->rst); + reset_control_deassert(dw_wdt->rst); + + return 0; +} + static int dw_wdt_restart_handle(struct notifier_block *this, unsigned long mode, void *cmd) { @@ -177,6 +192,7 @@ static const struct watchdog_info dw_wdt_ident = { static const struct watchdog_ops dw_wdt_ops = { .owner = THIS_MODULE, .start = dw_wdt_start, + .stop = dw_wdt_stop, .ping = dw_wdt_ping, .set_timeout = dw_wdt_set_timeout, .get_timeleft = dw_wdt_get_timeleft, -- 2.8.1