Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / watchdog / imx2_wdt.c

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 1fe472f..cc86018 100644 (file)
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -2,7 +2,7 @@
 /*
  * Watchdog driver for IMX2 and later processors
  *
- *  Copyright (C) 2010 Wolfram Sang, Pengutronix e.K. <w.sang@pengutronix.de>
+ *  Copyright (C) 2010 Wolfram Sang, Pengutronix e.K. <kernel@pengutronix.de>
  *  Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * some parts adapted by similar drivers from Darius Augulis and Vladimir
@@ -65,6 +65,7 @@ struct imx2_wdt_device {
        struct regmap *regmap;
        struct watchdog_device wdog;
        bool ext_reset;
+       bool clk_is_on;
 };
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -160,6 +161,9 @@ static int imx2_wdt_ping(struct watchdog_device *wdog)
 {
        struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog);
 
+       if (!wdev->clk_is_on)
+               return 0;
+
        regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ1);
        regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ2);
        return 0;
@@ -301,6 +305,8 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       wdev->clk_is_on = true;
+
        regmap_read(wdev->regmap, IMX2_WDT_WRSR, &val);
        wdog->bootstatus = val & IMX2_WDT_WRSR_TOUT ? WDIOF_CARDRESET : 0;
 
@@ -361,6 +367,8 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev)
 
        clk_disable_unprepare(wdev->clk);
 
+       wdev->clk_is_on = false;
+
        return 0;
 }
 
@@ -375,6 +383,8 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev)
        if (ret)
                return ret;
 
+       wdev->clk_is_on = true;
+
        if (watchdog_active(wdog) && !imx2_wdt_is_running(wdev)) {
                /*
                 * If the watchdog is still active and resumes