summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRay Jui <ray.jui@broadcom.com>2018-05-28 20:01:34 +0200
committerWim Van Sebroeck <wim@linux-watchdog.org>2018-08-02 15:57:10 +0200
commitb800885888406f33edfec0eb1cb752292f23de83 (patch)
tree9d7843f1cdfe9c21a238fadc1defc8f81eb10966 /drivers
parentdt-bindings: watchdog: Add optional 'timeout-sec' property for sp805 (diff)
downloadlinux-b800885888406f33edfec0eb1cb752292f23de83.tar.xz
linux-b800885888406f33edfec0eb1cb752292f23de83.zip
watchdog: sp805: add 'timeout-sec' DT property support
Add support for optional devicetree property 'timeout-sec'. 'timeout-sec' is used in the driver if specified in devicetree. Otherwise, fall back to driver default, i.e., 60 seconds Signed-off-by: Ray Jui <ray.jui@broadcom.com> Reviewed-by: Scott Branden <scott.branden@broadcom.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/sp805_wdt.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 9849db0743a7..b240195597c1 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -244,7 +244,14 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
watchdog_set_nowayout(&wdt->wdd, nowayout);
watchdog_set_drvdata(&wdt->wdd, wdt);
watchdog_set_restart_priority(&wdt->wdd, 128);
- wdt_setload(&wdt->wdd, DEFAULT_TIMEOUT);
+
+ /*
+ * If 'timeout-sec' devicetree property is specified, use that.
+ * Otherwise, use DEFAULT_TIMEOUT
+ */
+ wdt->wdd.timeout = DEFAULT_TIMEOUT;
+ watchdog_init_timeout(&wdt->wdd, 0, &adev->dev);
+ wdt_setload(&wdt->wdd, wdt->wdd.timeout);
ret = watchdog_register_device(&wdt->wdd);
if (ret) {