]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE"
authorScott Wood <scottwood@freescale.com>
Thu, 13 Mar 2014 00:24:45 +0000 (19:24 -0500)
committerScott Wood <scottwood@freescale.com>
Thu, 20 Mar 2014 00:57:35 +0000 (19:57 -0500)
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>
drivers/watchdog/booke_wdt.c

index f1b8d555080e8c562ea1cb886b42c77f8c8b0c1f..a8dbceb32914a0e834a8c6b8ae394898c213e527 100644 (file)
@@ -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);
 }