imx_watchdog: Do not assert WDOG_B on watchdog init
authorRoss Parker <rossjparker@gmail.com>
Tue, 2 Aug 2016 08:08:07 +0000 (08:08 +0000)
committerStefano Babic <sbabic@denx.de>
Tue, 4 Oct 2016 10:01:14 +0000 (12:01 +0200)
Currently the driver asserts WDOG_B by clearing WCR_WDA bit when
enabling the watchdog. Do not clear WCR_WDA.

Signed-off-by: Ross Parker <rossjparker@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
drivers/watchdog/imx_watchdog.c
include/fsl_wdog.h

index 2938d9f..3f826d1 100644 (file)
@@ -34,7 +34,7 @@ void hw_watchdog_init(void)
 #endif
        timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1;
        writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS |
-               SET_WCR_WT(timeout), &wdog->wcr);
+               WCR_WDA | SET_WCR_WT(timeout), &wdog->wcr);
        hw_watchdog_reset();
 }
 #endif
index f698d4d..683c3f3 100644 (file)
@@ -15,5 +15,6 @@ struct watchdog_regs {
 #define WCR_WDE                0x04
 #define WCR_WDT                0x08
 #define WCR_SRS                0x10
+#define WCR_WDA        0x20
 #define SET_WCR_WT(x)  (x << 8)
 #define WCR_WT_MSK     SET_WCR_WT(0xFF)