leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx_watchdog: Do not assert WDOG_B on watchdog init

Browse Source 
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>
This commit is contained in:
Ross Parker 2016-08-02 08:08:07 +00:00 committed by Stefano Babic
parent 514a0f4b68
commit 9eeab57211
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/imx_watchdog.c
View File

@ -34,7 +34,7 @@ void hw_watchdog_init(void)
#endif #endif
timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1; timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1;
writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS | 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(); hw_watchdog_reset();
} }
#endif #endif

1
include/fsl_wdog.h
View File

@ -15,5 +15,6 @@ struct watchdog_regs {
#define WCR_WDE 0x04 #define WCR_WDE 0x04
#define WCR_WDT 0x08 #define WCR_WDT 0x08
#define WCR_SRS 0x10 #define WCR_SRS 0x10
#define WCR_WDA 0x20
#define SET_WCR_WT(x) (x << 8) #define SET_WCR_WT(x) (x << 8)
#define WCR_WT_MSK SET_WCR_WT(0xFF) #define WCR_WT_MSK SET_WCR_WT(0xFF)