diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-31 11:45:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-31 11:45:36 -0400 |
| commit | 9da7e3daf31d7c0c8478a57544bfdd6245e53ff3 (patch) | |
| tree | 243aeb8eccea5ee12e529843fb348f75111e44bf /drivers | |
| parent | 52091ad146d766cdc5ccd65430b2a4e5cb7aec32 (diff) | |
| parent | 5cab874052614fb130cd9b16fc6a3d27cae0741e (diff) | |
| download | u-boot-imx-9da7e3daf31d7c0c8478a57544bfdd6245e53ff3.zip u-boot-imx-9da7e3daf31d7c0c8478a57544bfdd6245e53ff3.tar.gz u-boot-imx-9da7e3daf31d7c0c8478a57544bfdd6245e53ff3.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/imx_watchdog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index d5993b4..1d18d4b 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -20,7 +20,6 @@ struct watchdog_regs { #define WCR_WDE 0x04 /* WDOG enable */ #define WCR_WDT 0x08 #define WCR_SRS 0x10 -#define WCR_WDW 0x80 #define SET_WCR_WT(x) (x << 8) #ifdef CONFIG_IMX_WATCHDOG @@ -47,7 +46,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 | - WCR_WDW | SET_WCR_WT(timeout), &wdog->wcr); + SET_WCR_WT(timeout), &wdog->wcr); hw_watchdog_reset(); } #endif |