[U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init

Ross Parker rossjparker at gmail.com
Tue Aug 2 10:08:07 CEST 2016


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 at gmail.com>
Cc: Stefano Babic <sbabic at denx.de>

---
 drivers/watchdog/imx_watchdog.c | 2 +-
 include/fsl_wdog.h              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/imx_watchdog.c
b/drivers/watchdog/imx_watchdog.c
index 2938d9f..3f826d1 100644
--- 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 f698d4d..7818f78 100644
--- 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)
-- 
1.9.1


More information about the U-Boot mailing list