diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
| commit | 1a9c229bf754c89f42b085451ad506693f326427 (patch) | |
| tree | 288106d7498591ac889fa972d0c24fc5c9b811f9 /drivers/watchdog/imx_watchdog.c | |
| parent | d0f30211e9823694c1c2c79f471dbe9d498a40fd (diff) | |
| parent | f697c2acca9ff02c9b0cf480a4a726ed9626a53a (diff) | |
| download | u-boot-1a9c229bf754c89f42b085451ad506693f326427.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/watchdog/imx_watchdog.c')
| -rw-r--r-- | drivers/watchdog/imx_watchdog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index 1d18d4b269..9a77a54192 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -55,7 +55,8 @@ void reset_cpu(ulong addr) { struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; - writew(WCR_WDE, &wdog->wcr); + clrsetbits_le16(&wdog->wcr, 0, WCR_WDE); + writew(0x5555, &wdog->wsr); writew(0xaaaa, &wdog->wsr); /* load minimum 1/2 second timeout */ while (1) { |