Move Loongson1 restart handler to watchdog driver
and update the Makefile accordingly.
Changelog
V1 -> V2: Remove the reference to regs-wdt.h
Keguang Zhang (2):
MIPS: Loongson32: Remove reset.c
watchdog: loongson1_wdt: Implement restart handler
.../include/asm/mach-loongson32/loongson1.h | 1 -
.../include/asm/mach-loongson32/regs-wdt.h | 15 ------
arch/mips/loongson32/common/Makefile | 2 +-
arch/mips/loongson32/common/reset.c | 51 -------------------
drivers/watchdog/loongson1_wdt.c | 19 ++++++-
5 files changed, 19 insertions(+), 69 deletions(-)
delete mode 100644 arch/mips/include/asm/mach-loongson32/regs-wdt.h
delete mode 100644 arch/mips/loongson32/common/reset.c
base-commit: cf3be7e82b129ed34f811f116f2b113f6299d449
--
2.34.1
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 <[email protected]>
---
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
On Thu, Mar 30, 2023 at 07:20:51PM +0800, Keguang Zhang wrote:
> 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 <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
> 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)