From: Scott Wood <scottwood@freescale.com>
Date: Thu, 13 Mar 2014 00:24:45 +0000 (-0500)
Subject: Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE"
X-Git-Tag: v3.15-rc1~124^2^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=093943735718a28d45dcfcc74a737ed39e402893;p=karo-tx-linux.git

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>
---

diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index f1b8d555080e..a8dbceb32914 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -138,14 +138,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);
 }