diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-09-14 13:34:44 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-09-20 09:39:35 +0200 |
| commit | 623d96e89aca64c2762150087f4e872c55481f13 (patch) | |
| tree | 2e5b5b45143720e6352ebe854580eb7f956bc1f6 /drivers | |
| parent | c3c8a5748897b24f18618047804317167a531dd3 (diff) | |
| download | talos-obmc-uboot-623d96e89aca64c2762150087f4e872c55481f13.tar.gz talos-obmc-uboot-623d96e89aca64c2762150087f4e872c55481f13.zip | |
imx: wdog: correct wcr register settings
We should not simple use "writew(WCR_WDE, &wdog->wcr)" to set
wcr, since this will override bits set before reset_cpu.
Use clrsetbits_le16 instead of writew to fix this issue.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'drivers')
| -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) { |
