watchdog: Fix OMAP watchdog early handling

TI's implementation does not service the watchdog even if the kernel
command line parameter omap_wdt.early_enable is set to 1. This patch
fixes the issue.

Signed-off-by: Walter Stoll <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Guenter Roeck <[email protected]>
Signed-off-by: Wim Van Sebroeck <[email protected]>

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 1616f93dfad7fcdccf7d74a7dc18d979a1643e7a..74d785b2b478f4719c78eae1425f826e7368b526 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -268,8 +268,12 @@ static int omap_wdt_probe(struct platform_device *pdev)
                        wdev->wdog.bootstatus = WDIOF_CARDRESET;
        }
 
-       if (!early_enable)
+       if (early_enable) {
+               omap_wdt_start(&wdev->wdog);
+               set_bit(WDOG_HW_RUNNING, &wdev->wdog.status);
+       } else {
                omap_wdt_disable(wdev);
+       }
 
        ret = watchdog_register_device(&wdev->wdog);
        if (ret) {