diff options
| author | Ross Parker | 2016-08-02 08:08:07 +0000 |
|---|---|---|
| committer | Stefano Babic | 2016-10-04 12:01:14 +0200 |
| commit | 9eeab572113b2978d42cbb32886a1e90434bf07c (patch) | |
| tree | 84889d0fd0acbeb07f3600312b8ec070c83cd05e | |
| parent | 514a0f4b680bf93dc8fe0e7d3e9097dfee1625b6 (diff) | |
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>
| -rw-r--r-- | drivers/watchdog/imx_watchdog.c | 2 | ||||
| -rw-r--r-- | include/fsl_wdog.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index 2938d9f1fe9..3f826d10eb9 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 f698d4d64ed..683c3f3bac6 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) |