Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8008858 authored by Ray Jui's avatar Ray Jui Committed by Wim Van Sebroeck
Browse files

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: default avatarRay Jui <ray.jui@broadcom.com>
Reviewed-by: default avatarScott Branden <scott.branden@broadcom.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 42bf5c44

drivers/watchdog/sp805_wdt.c

+8 −1
Original line number Diff line number Diff line
@@ -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) {