Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a23f7dc8 authored by David Griego's avatar David Griego Committed by Kevin Hilman
Browse files

davinci: Fix watchdog reset code 



The davinci reset routine, davinci_watchdog_reset(), sets the
TCR register instead of the TGCR register as it should to put
the WDT into its "Initial State".

It also writes the WDTCR register without the proper WDKEY
which is pointless since the register will be write-protected.

Signed-off-by: default avatarDavid Griego <dgriego@mvista.com>
Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 75d0fa70

arch/arm/mach-davinci/time.c

+3 −7
Original line number Diff line number Diff line
@@ -420,11 +420,11 @@ void davinci_watchdog_reset(void) 


	/* reset timer, set mode to 64-bit watchdog, and unreset */

	tgcr = 0;

	__raw_writel(tgcr, base + TCR);

	__raw_writel(tgcr, base + TGCR);

	tgcr = TGCR_TIMMODE_64BIT_WDOG << TGCR_TIMMODE_SHIFT;

	tgcr |= (TGCR_UNRESET << TGCR_TIM12RS_SHIFT) |

		(TGCR_UNRESET << TGCR_TIM34RS_SHIFT);

	__raw_writel(tgcr, base + TCR);

	__raw_writel(tgcr, base + TGCR);



	/* clear counter and period regs */

	__raw_writel(0, base + TIM12);
@@ -432,12 +432,8 @@ void davinci_watchdog_reset(void) 
	__raw_writel(0, base + PRD12);

	__raw_writel(0, base + PRD34);



	/* enable */

	wdtcr = __raw_readl(base + WDTCR);

	wdtcr |= WDTCR_WDEN_ENABLE << WDTCR_WDEN_SHIFT;

	__raw_writel(wdtcr, base + WDTCR);



	/* put watchdog in pre-active state */

	wdtcr = __raw_readl(base + WDTCR);

	wdtcr = (WDTCR_WDKEY_SEQ0 << WDTCR_WDKEY_SHIFT) |

		(WDTCR_WDEN_ENABLE << WDTCR_WDEN_SHIFT);

	__raw_writel(wdtcr, base + WDTCR);