summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lange <thomas@corelatus.se>2009-05-03 20:07:33 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:51 +0200
commit2ae0f35fd60c7345446835b95a4daff356e1f031 (patch)
tree1c7cce141811b1702b69083404f97da718189876
parent6cc7ba9ed43106946aa9aa868302aa2faf1d17be (diff)
downloadu-boot-imx-2ae0f35fd60c7345446835b95a4daff356e1f031.zip
u-boot-imx-2ae0f35fd60c7345446835b95a4daff356e1f031.tar.gz
u-boot-imx-2ae0f35fd60c7345446835b95a4daff356e1f031.tar.bz2
ARM DaVinci: Reset with watchdog enabled
Once the Davinci watchdog has been enabled, the timeout value cannot be changed. If the timeout in use is long, it can take a long time for card to reset. By writing an invalid service key, we can trigger an immediate reset. Signed-off-by: Thomas Lange <thomas@corelatus.se>
-rw-r--r--cpu/arm926ejs/davinci/reset.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu/arm926ejs/davinci/reset.S b/cpu/arm926ejs/davinci/reset.S
index a687d44..ba0a7c3 100644
--- a/cpu/arm926ejs/davinci/reset.S
+++ b/cpu/arm926ejs/davinci/reset.S
@@ -50,6 +50,10 @@ reset_cpu:
str r1, [r0]
ldr r1, WDTCR_VAL2
str r1, [r0]
+ /* Write an invalid value to the WDKEY field to trigger
+ * an immediate watchdog reset */
+ mov r1, $0x4000
+ str r1, [r0]
nop
nop
nop