Message ID | 20121121104512.GA19045@BT22081 |
---|---|
State | Awaiting Upstream |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Nov 21, 2012 at 12:45:12AM -0000, Davide Bonfanti wrote: > 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> Applied to u-boot-ti/master, thanks!
diff --git a/arch/arm/cpu/arm926ejs/davinci/reset.c b/arch/arm/cpu/arm926ejs/davinci/reset.c index 968fb03..80f1ce9 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);
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)