From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0208.outbound.protection.outlook.com [207.46.163.208]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1429E2C0147 for ; Fri, 14 Mar 2014 11:01:32 +1100 (EST) From: Scott Wood To: Benjamin Herrenschmidt Subject: [PATCH 10/10] Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE" Date: Thu, 13 Mar 2014 19:00:49 -0500 Message-ID: <1394755249-8856-11-git-send-email-scottwood@freescale.com> In-Reply-To: <1394755249-8856-1-git-send-email-scottwood@freescale.com> References: <1394755249-8856-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Cc: Tiejun Chen , Wim Van Sebroeck , Laurentiu Tudor , Scott Wood , linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that critical interrupts are properly supported on ppc64 booke. Signed-off-by: Scott Wood Cc: Laurentiu Tudor Cc: Wim Van Sebroeck --- drivers/watchdog/booke_wdt.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index f1b8d55..a8dbceb3 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); } -- 1.8.3.2