From: Guenter Roeck Date: Sun, 17 Jul 2016 20:47:47 +0000 (-0700) Subject: watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7ef68c32265a396a4d977f896a11a4cebb0ace4;p=linux-beck.git watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout Setting max_hw_heartbeat_ms lets the watchdog core provide a virtual timeout if the timeout requested by user space is larger than the maximum hardware timeout. Also, it helps the watchdog core to provide heartbeats if the hardware watchdog is running while closed. Fixes: a3e376d26ace ("watchdog: tangox: Mark running watchdog correctly") Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c index e7a5d0fc81d4..202c4b9cc921 100644 --- a/drivers/watchdog/tangox_wdt.c +++ b/drivers/watchdog/tangox_wdt.c @@ -149,7 +149,7 @@ static int tangox_wdt_probe(struct platform_device *pdev) dev->wdt.ops = &tangox_wdt_ops; dev->wdt.timeout = DEFAULT_TIMEOUT; dev->wdt.min_timeout = 1; - dev->wdt.max_timeout = (U32_MAX - 1) / dev->clk_rate; + dev->wdt.max_hw_heartbeat_ms = (U32_MAX - 1) / dev->clk_rate; watchdog_init_timeout(&dev->wdt, timeout, &pdev->dev); watchdog_set_nowayout(&dev->wdt, nowayout);