Merge tag 'iio-fixes-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / watchdog / dw_wdt.c

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index c2f4ff51623015ca32aca20d3ad74ff05fe38e29..501aebb5b81f65cb92edb0f9fc5a33745c2a65b1 100644 (file)
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -34,6 +34,7 @@
 
 #define WDOG_CONTROL_REG_OFFSET                    0x00
 #define WDOG_CONTROL_REG_WDT_EN_MASK       0x01
+#define WDOG_CONTROL_REG_RESP_MODE_MASK            0x02
 #define WDOG_TIMEOUT_RANGE_REG_OFFSET      0x04
 #define WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT    4
 #define WDOG_CURRENT_COUNT_REG_OFFSET      0x08
@@ -56,6 +57,9 @@ struct dw_wdt {
        unsigned long           rate;
        struct watchdog_device  wdd;
        struct reset_control    *rst;
+       /* Save/restore */
+       u32                     control;
+       u32                     timeout;
 };
 
 #define to_dw_wdt(wdd) container_of(wdd, struct dw_wdt, wdd)
@@ -121,14 +125,23 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
        return 0;
 }
 
+static void dw_wdt_arm_system_reset(struct dw_wdt *dw_wdt)
+{
+       u32 val = readl(dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+
+       /* Disable interrupt mode; always perform system reset. */
+       val &= ~WDOG_CONTROL_REG_RESP_MODE_MASK;
+       /* Enable watchdog. */
+       val |= WDOG_CONTROL_REG_WDT_EN_MASK;
+       writel(val, dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+}
+
 static int dw_wdt_start(struct watchdog_device *wdd)
 {
        struct dw_wdt *dw_wdt = to_dw_wdt(wdd);
 
        dw_wdt_set_timeout(wdd, wdd->timeout);
-
-       writel(WDOG_CONTROL_REG_WDT_EN_MASK,
-              dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+       dw_wdt_arm_system_reset(dw_wdt);
 
        return 0;
 }
@@ -152,16 +165,13 @@ static int dw_wdt_restart(struct watchdog_device *wdd,
                          unsigned long action, void *data)
 {
        struct dw_wdt *dw_wdt = to_dw_wdt(wdd);
-       u32 val;
 
        writel(0, dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
-       val = readl(dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
-       if (val & WDOG_CONTROL_REG_WDT_EN_MASK)
+       if (dw_wdt_is_enabled(dw_wdt))
                writel(WDOG_COUNTER_RESTART_KICK_VALUE,
                       dw_wdt->regs + WDOG_COUNTER_RESTART_REG_OFFSET);
        else
-               writel(WDOG_CONTROL_REG_WDT_EN_MASK,
-                      dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+               dw_wdt_arm_system_reset(dw_wdt);
 
        /* wait for reset to assert... */
        mdelay(500);
@@ -198,6 +208,9 @@ static int dw_wdt_suspend(struct device *dev)
 {
        struct dw_wdt *dw_wdt = dev_get_drvdata(dev);
 
+       dw_wdt->control = readl(dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+       dw_wdt->timeout = readl(dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
+
        clk_disable_unprepare(dw_wdt->clk);
 
        return 0;
@@ -211,6 +224,9 @@ static int dw_wdt_resume(struct device *dev)
        if (err)
                return err;
 
+       writel(dw_wdt->timeout, dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
+       writel(dw_wdt->control, dw_wdt->regs + WDOG_CONTROL_REG_OFFSET);
+
        dw_wdt_ping(&dw_wdt->wdd);
 
        return 0;