diff options
| author |   Scott Wood <scottwood@freescale.com> | 2014-03-12 19:24:45 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-03-19 19:57:35 -0500 |
| commit | 093943735718a28d45dcfcc74a737ed39e402893 (patch) | |
| tree | 53c8416fe4004ffcd5371f02374de638257e6ab5 /drivers/watchdog | |
| parent | powerpc/booke64: Critical and machine check exception support (diff) | |
| download | linux-dev-093943735718a28d45dcfcc74a737ed39e402893.tar.xz linux-dev-093943735718a28d45dcfcc74a737ed39e402893.zip | |
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/booke_wdt.c | 8 |
1 files changed, 0 insertions, 8 deletions
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); } |