summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuuk Paulussen <luuk.paulussen@alliedtelesis.co.nz>2010-04-15 15:59:10 +1200
committerWim Van Sebroeck <wim@iguana.be>2010-04-16 12:23:04 +0000
commit0fb06571bbb5c72b4663c20f721323260ea802bf (patch)
treeb84deaf4dfbb3a1ce97bb6032a07de9c9afff21e
parent77165a48edeaf4758588563c0592af6559e8b256 (diff)
downloadlinux-3.10-0fb06571bbb5c72b4663c20f721323260ea802bf.tar.gz
linux-3.10-0fb06571bbb5c72b4663c20f721323260ea802bf.tar.bz2
linux-3.10-0fb06571bbb5c72b4663c20f721323260ea802bf.zip
[WATCHDOG] fixed book E watchdog period register mask.
A previous fix changed the WDTP function to use the period directly, rather than subtracting from 63. However the mask generation was not changed, so the mask was coming out as 0. This patch fixes it. Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/booke_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 8b724aad682..500d38342e1 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -44,7 +44,7 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
#ifdef CONFIG_FSL_BOOKE
#define WDTP(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
-#define WDTP_MASK (WDTP(0))
+#define WDTP_MASK (WDTP(0x3f))
#else
#define WDTP(x) (TCR_WP(x))
#define WDTP_MASK (TCR_WP_MASK)