Merge branches 'pm-sleep' and 'pm-cpufreq'

[platform/kernel/linux-starfive.git] / drivers / watchdog / tangox_wdt.c

diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c
index cfbed7e..202c4b9 100644 (file)
--- 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);
@@ -170,7 +170,7 @@ static int tangox_wdt_probe(struct platform_device *pdev)
         * already running.
         */
        if (readl(dev->base + WD_COUNTER)) {
-               set_bit(WDOG_ACTIVE, &dev->wdt.status);
+               set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
                tangox_wdt_start(&dev->wdt);
        }