diff --git a/arch/arm64/boot/dts/ti/k3-am62x-pfc.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-pfc.dtsi index ec0fb9c27485..a0a54762f32d 100644 --- a/arch/arm64/boot/dts/ti/k3-am62x-pfc.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62x-pfc.dtsi @@ -886,6 +886,14 @@ }; }; +/* + * This system watchdog is reserved for internal use and is not user-configurable. + * It must not be modified or deleted to ensure consistent behavior! + */ +&main_rti1 { // watchdog@e010000 + timeout-sec = <120>; +}; + /* * AM6232 does not have main_rti2, main_rti3, and main_rti15 * https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1218039/am623-stuck-in-sd-card-after-boot-up diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index cc239251e193..2bdc4133d346 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -335,7 +335,9 @@ static int rti_wdt_probe(struct platform_device *pdev) memunmap(vaddr); } - watchdog_init_timeout(wdd, heartbeat, dev); + // grab timeout from DTS first + wdd->timeout = heartbeat; + watchdog_init_timeout(wdd, 0, dev); ret = watchdog_register_device(wdd); if (ret) {