Thread (15 messages) 15 messages, 3 authors, 2021-11-10

Re: [PATCH v4 2/3] watchdog: meson_gxbb_wdt: add timeout parameter

From: Art Nikpal <hidden>
Date: 2021-11-09 07:59:40
Also in: linux-amlogic, linux-watchdog, lkml

hi Guenter Roeck
why still not merged to upstream ?

On Fri, Jul 30, 2021 at 12:14 PM Artem Lapkin [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Add timeout module parameter

Signed-off-by: Artem Lapkin <redacted>
---
 drivers/watchdog/meson_gxbb_wdt.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
index 5aebc3a09652..945f5e65db57 100644
--- a/drivers/watchdog/meson_gxbb_wdt.c
+++ b/drivers/watchdog/meson_gxbb_wdt.c
@@ -34,6 +34,11 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default="
                 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");

+static unsigned int timeout;
+module_param(timeout, uint, 0);
+MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds="
+                __MODULE_STRING(DEFAULT_TIMEOUT) ")");
+
 struct meson_gxbb_wdt {
        void __iomem *reg_base;
        struct watchdog_device wdt_dev;
@@ -180,6 +185,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
        data->wdt_dev.max_hw_heartbeat_ms = GXBB_WDT_TCNT_SETUP_MASK;
        data->wdt_dev.min_timeout = 1;
        data->wdt_dev.timeout = DEFAULT_TIMEOUT;
+       watchdog_init_timeout(&data->wdt_dev, timeout, dev);
        watchdog_set_nowayout(&data->wdt_dev, nowayout);
        watchdog_set_drvdata(&data->wdt_dev, data);

--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help