From: Keguang Zhang <keguang.zhang@gmail.com>
To: linux-watchdog@vger.kernel.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Yang Ling <gnaygnil@gmail.com>,
Keguang Zhang <keguang.zhang@gmail.com>
Subject: [PATCH v2 2/2] watchdog: loongson1_wdt: Implement restart handler
Date: Thu, 30 Mar 2023 19:20:51 +0800 [thread overview]
Message-ID: <20230330112051.551648-3-keguang.zhang@gmail.com> (raw)
In-Reply-To: <20230330112051.551648-1-keguang.zhang@gmail.com>
Implement restart handler for the Loongson-1 watchdog driver and
define the watchdog registers instead of including the legacy header.
Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
---
V1 -> V2: None
---
drivers/watchdog/loongson1_wdt.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c
index bb3d075c0633..a0b6fe62e516 100644
--- a/drivers/watchdog/loongson1_wdt.c
+++ b/drivers/watchdog/loongson1_wdt.c
@@ -7,7 +7,11 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
-#include <loongson1.h>
+
+/* Loongson 1 Watchdog Register Definitions */
+#define WDT_EN 0x0
+#define WDT_TIMER 0x4
+#define WDT_SET 0x8
#define DEFAULT_HEARTBEAT 30
@@ -66,6 +70,18 @@ static int ls1x_wdt_stop(struct watchdog_device *wdt_dev)
return 0;
}
+static int ls1x_wdt_restart(struct watchdog_device *wdt_dev,
+ unsigned long action, void *data)
+{
+ struct ls1x_wdt_drvdata *drvdata = watchdog_get_drvdata(wdt_dev);
+
+ writel(0x1, drvdata->base + WDT_EN);
+ writel(0x1, drvdata->base + WDT_TIMER);
+ writel(0x1, drvdata->base + WDT_SET);
+
+ return 0;
+}
+
static const struct watchdog_info ls1x_wdt_info = {
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
.identity = "Loongson1 Watchdog",
@@ -77,6 +93,7 @@ static const struct watchdog_ops ls1x_wdt_ops = {
.stop = ls1x_wdt_stop,
.ping = ls1x_wdt_ping,
.set_timeout = ls1x_wdt_set_timeout,
+ .restart = ls1x_wdt_restart,
};
static void ls1x_clk_disable_unprepare(void *data)
--
2.34.1
next prev parent reply other threads:[~2023-03-30 11:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 11:20 [PATCH v2 0/2] Move Loongson1 restart handler to watchdog driver Keguang Zhang
2023-03-30 11:20 ` [PATCH v2 1/2] MIPS: Loongson32: Remove reset.c Keguang Zhang
2023-03-30 11:20 ` Keguang Zhang [this message]
2023-04-16 16:16 ` [PATCH v2 2/2] watchdog: loongson1_wdt: Implement restart handler Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230330112051.551648-3-keguang.zhang@gmail.com \
--to=keguang.zhang@gmail.com \
--cc=gnaygnil@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=tsbogend@alpha.franken.de \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).