From 4f8c9528944eff1bd8c6bcbfc9d1ae2b7a0edef7 Mon Sep 17 00:00:00 2001 From: David Griego Date: Mon, 1 Jun 2009 11:41:54 -0700 Subject: [PATCH] --- yaml --- r: 163167 b: refs/heads/master c: a23f7dc82d48d7fc8377765f6ede907daef4e63b h: refs/heads/master i: 163165: e00f1395a78ce5354c3caf0ee7bf661263ebad0f 163163: 60f5ce10837749efad264b79f6e88258202eeabb 163159: 86691500ab480f9ad69e7c86feb6454fbb1bd5b2 163151: aeeab6b9b4d226fc38cfaaeebb081f93dc56704f 163135: b87cc041a1b4b26ab641c21da8057d59d1e9381a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/time.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 61f5a4a660c4..002ebb00ab44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75d0fa70e748629b786c25530f7c5ae76587da35 +refs/heads/master: a23f7dc82d48d7fc8377765f6ede907daef4e63b diff --git a/trunk/arch/arm/mach-davinci/time.c b/trunk/arch/arm/mach-davinci/time.c index 0884ca57bfb0..ca85d1871762 100644 --- a/trunk/arch/arm/mach-davinci/time.c +++ b/trunk/arch/arm/mach-davinci/time.c @@ -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);