projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc1182b
)
davinci: fixed cpu reset
author
Davide Bonfanti
<davide.bonfanti@bticino.it>
Wed, 21 Nov 2012 00:45:12 +0000
(
00:45
+0000)
committer
Tom Rini
<trini@ti.com>
Mon, 10 Dec 2012 15:56:38 +0000
(08:56 -0700)
The reset procedure works on watchdog timer while before it was modifying
TIMER_1 registers.
Tested on DM365.
Signed-off-by: Davide Bonfanti <davide.bonfanti@bticino.it>
arch/arm/cpu/arm926ejs/davinci/reset.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/arm926ejs/davinci/reset.c
b/arch/arm/cpu/arm926ejs/davinci/reset.c
index 968fb035c89f9cada737f6eaaed0eef26cb2561d..80f1ce9d31815e637e54214097f7749d2715a8b0 100644
(file)
--- a/
arch/arm/cpu/arm926ejs/davinci/reset.c
+++ b/
arch/arm/cpu/arm926ejs/davinci/reset.c
@@
-16,7
+16,7
@@
void reset_cpu(unsigned long a)
{
struct davinci_timer *const wdttimer =
- (struct davinci_timer *)DAVINCI_
TIMER1
_BASE;
+ (struct davinci_timer *)DAVINCI_
WDOG
_BASE;
writel(0x08, &wdttimer->tgcr);
writel(readl(&wdttimer->tgcr) | 0x03, &wdttimer->tgcr);
writel(0, &wdttimer->tim12);