Commit 4962ee04 authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Wim Van Sebroeck
Browse files

watchdog: rti: of: honor timeout-sec property 



Currently "timeout-sec" Device Tree property is being silently ignored:
even though watchdog_init_timeout() is being used, the driver always passes
"heartbeat" == DEFAULT_HEARTBEAT == 60 as argument.

Fix this by setting struct watchdog_device::timeout to DEFAULT_HEARTBEAT
and passing real module parameter value to watchdog_init_timeout() (which
may now be 0 if not specified).

Cc: stable@vger.kernel.org
Fixes: 2d63908b ("watchdog: Add K3 RTI watchdog support")
Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@siemens.com>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241107203830.1068456-1-alexander.sverdlin@siemens.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent a5cb1398

drivers/watchdog/rti_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


#define MAX_HW_ERROR		250



static int heartbeat = DEFAULT_HEARTBEAT;

static int heartbeat;



/*

 * struct to hold data for each WDT device
@@ -252,6 +252,7 @@ static int rti_wdt_probe(struct platform_device *pdev) 
	wdd->min_timeout = 1;

	wdd->max_hw_heartbeat_ms = (WDT_PRELOAD_MAX << WDT_PRELOAD_SHIFT) /

		wdt->freq * 1000;

	wdd->timeout = DEFAULT_HEARTBEAT;

	wdd->parent = dev;



	watchdog_set_drvdata(wdd, wdt);