summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-03-13 00:24:45 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-03-28 14:01:06 (GMT)
commit3660eab34a82e7101313ea18e72286561de4ed4a (patch)
tree4ecb5198ad032d0512cdbf2494fb61cdf0021a21 /drivers/watchdog
parenta47e780996b3bcfc715f1dede33e9351fbc5316b (diff)
downloadlinux-fsl-qoriq-3660eab34a82e7101313ea18e72286561de4ed4a.tar.xz
Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE"
This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that critical interrupts are properly supported on ppc64 booke. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com> Cc: Wim Van Sebroeck <wim@iguana.be> Change-Id: I9d0eae461856d2fab1e3edf6a8ca14e3e1dae608 Reviewed-on: http://git.am.freescale.net:8181/10270 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bharat Bhushan <Bharat.Bhushan@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/booke_wdt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index fea9127..9a4d02b 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -147,14 +147,6 @@ static void __booke_wdt_enable(void *data)
val &= ~WDTP_MASK;
val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
-#ifdef CONFIG_PPC_BOOK3E_64
- /*
- * Crit ints are currently broken on PPC64 Book-E, so
- * just disable them for now.
- */
- val &= ~TCR_WIE;
-#endif
-
mtspr(SPRN_TCR, val);
}