imx_watchdog: Do not assert WDOG_B on watchdog init

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>

diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index 2938d9f1fe9507fe05f42c60d2db6fa3d59d81dc..3f826d10eb918cb9970ece1ed1e8c7466cbc8500 100644 (file)
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -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

diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index f698d4d64edc9b6cd544d800e18f8fcd7d350f3a..683c3f3bac6600e2cfc27c738ca7867d66d956ce 100644 (file)
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -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)