diff options
| author | Matthias Weisser <weisserm@arcor.de> | 2010-10-27 16:34:38 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2010-10-28 10:32:21 +0200 |
| commit | 81129d07a0e9f6e28029170b082d6f8810f72712 (patch) | |
| tree | b6c747f51a5ff896e3950d976cd4a0515668c896 /arch/arm/cpu | |
| parent | 95707aaa9ef2dd84649c257cdcf563641322c4d3 (diff) | |
| download | u-boot-imx-81129d07a0e9f6e28029170b082d6f8810f72712.zip u-boot-imx-81129d07a0e9f6e28029170b082d6f8810f72712.tar.gz u-boot-imx-81129d07a0e9f6e28029170b082d6f8810f72712.tar.bz2 | |
imx25: Fix reset
This patch fixes the reset command on imx25. The watchdog registers are 16
bits in size and not 32. This patch also adds the service register codes as
constants.
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx25/reset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c index 1e33150..1a43683 100644 --- a/arch/arm/cpu/arm926ejs/mx25/reset.c +++ b/arch/arm/cpu/arm926ejs/mx25/reset.c @@ -43,14 +43,14 @@ void reset_cpu (ulong ignored) { struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE; /* Disable watchdog and set Time-Out field to 0 */ - writel (0x00000000, ®s->wcr); + writew(0, ®s->wcr); /* Write Service Sequence */ - writel (0x00005555, ®s->wsr); - writel (0x0000AAAA, ®s->wsr); + writew(WSR_UNLOCK1, ®s->wsr); + writew(WSR_UNLOCK2, ®s->wsr); /* Enable watchdog */ - writel (WCR_WDE, ®s->wcr); + writew(WCR_WDE, ®s->wcr); while (1) ; } |