Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / booke_wdt.c

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