summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorDavide Bonfanti <davide.bonfanti@bticino.it>2012-11-21 00:45:12 +0000
committerTom Rini <trini@ti.com>2012-12-10 08:56:38 -0700
commit21f11c7b492794a4a0f69b95854043df9ea46b72 (patch)
tree07c4f2d868d11ad6df09f9c826f3a971fa454da6 /arch/arm/cpu
parentcc1182beea3712c948dd91d3877cacbbdab3d6ae (diff)
downloadtalos-obmc-uboot-21f11c7b492794a4a0f69b95854043df9ea46b72.tar.gz
talos-obmc-uboot-21f11c7b492794a4a0f69b95854043df9ea46b72.zip
davinci: fixed cpu reset
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>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/davinci/reset.c b/arch/arm/cpu/arm926ejs/davinci/reset.c
index 968fb035c8..80f1ce9d31 100644
--- 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);
OpenPOWER on IntegriCloud