summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2010-08-25 20:22:44 (GMT)
committerSandeep Paulraj <s-paulraj@ti.com>2010-09-08 18:51:18 (GMT)
commit543431b66dd9f3526f23546cac962c29ad0f485a (patch)
tree139fd7de177b6c747fdfc3bd3d80b7e96a5ca313 /arch/arm/cpu/armv7
parent0c0a0e07811965188d5f64cdbc186331c0598fa6 (diff)
downloadu-boot-543431b66dd9f3526f23546cac962c29ad0f485a.tar.xz
ARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4
Using the reset command on OMAP36XX/37XX and OMAP4 caused a hang. This patch uses the reset bit appropriate for each CPU architecture. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
-rw-r--r--arch/arm/cpu/armv7/omap-common/reset.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/reset.S b/arch/arm/cpu/armv7/omap-common/reset.S
index a53c408..838b122 100644
--- a/arch/arm/cpu/armv7/omap-common/reset.S
+++ b/arch/arm/cpu/armv7/omap-common/reset.S
@@ -27,10 +27,12 @@
reset_cpu:
ldr r1, rstctl @ get addr for global reset
@ reg
- mov r3, #0x2 @ full reset pll + mpu
+ ldr r3, rstbit @ sw reset bit
str r3, [r1] @ force reset
mov r0, r0
_loop_forever:
b _loop_forever
rstctl:
.word PRM_RSTCTRL
+rstbit:
+ .word PRM_RSTCTRL_RESET