From patchwork Tue Mar 19 16:51:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2302871 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 597C640B29 for ; Tue, 19 Mar 2013 16:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933393Ab3CSQwq (ORCPT ); Tue, 19 Mar 2013 12:52:46 -0400 Received: from mail-ye0-f201.google.com ([209.85.213.201]:47524 "EHLO mail-ye0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933290Ab3CSQwR (ORCPT ); Tue, 19 Mar 2013 12:52:17 -0400 Received: by mail-ye0-f201.google.com with SMTP id m12so63385yen.2 for ; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=UOICGPYERO1IbVQsZ+K1DbWbEorQs/B0aTihAPO3y1Q=; b=Ok0PgyY/4gAHUVXwNLuHsb/PNyBpm4oQ9oazB/VBPdkOqwB1/i21sOCx4ZkdrB3eX9 Bs8zKnDjYrm3yPjIes3AF56a5DhiD05g8PKHVF4l2327F5efgerhhO6dmQXMZ1HFJnyp K5F+V0XtWZRJSCfNk11KNqsoFb6kgR2KIrWTyywNpdDIg1YIn3/USRrx++u2mn+qKj8u rbypizHtRL7Z3vwB9ogLLNZDmFjIz606k7fAVhc+EWLTaJ88Y7ze5vbWB/xPYYr+luqx 0D4NW5FsYoqM6VGiMRTiz6VrWv7Z8yedM+QOUA2fck8Thrz7AutaHnSNMp/cYcY0nbTZ jqfQ== X-Received: by 10.224.185.79 with SMTP id cn15mr1579188qab.4.1363711936641; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id t12si1218113qcz.3.2013.03.19.09.52.16 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: from tictac.mtv.corp.google.com (dhcp-172-22-162-106.mtv.corp.google.com [172.22.162.106]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 58B215A4225; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 0978380E5C; Tue, 19 Mar 2013 09:52:15 -0700 (PDT) From: Doug Anderson To: Kukjin Kim Cc: Jongpill Lee , Jaecheol Lee , Thomas Abraham , Olof Johansson , Jonathan Kliegman , Michael Spang , Doug Anderson , Russell King , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm: exynos: Clear ENABLE_WAKEUP_SW bit when entering suspend Date: Tue, 19 Mar 2013 09:51:40 -0700 Message-Id: <1363711900-25560-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1363711900-25560-1-git-send-email-dianders@chromium.org> References: <1363711900-25560-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQn77Pcb8LVfA0e9NBtSE/P8HD37NvlXCSAfz/kG81Yw9ROznjqkZvUGwBeIuyijXA9GlMu7hdtsHWMC8+Ze+otHsGxDVi8fReepZ7MgF5+wvoMbXzHeWdABUdVy8Bvf8GMDN1V+p8GcWGKleBHAD58zH76tQwJS9AXNHnbo21duTdfcQvzQdBBS7LSn8Tjx6NPJ52Ltm0j0RTOFojdzpqFbFj+w3w== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Jonathan Kliegman Setting this bit to 0 causes the system to wait until suspended to use the wakeup masks. With it being set high previously, masked interrupts were being received and processed before the EINT_WAKEUP_MASK was configured. Signed-off-by: Jonathan Kliegman Signed-off-by: Doug Anderson Reviewed-by: Doug Anderson --- arch/arm/mach-exynos/include/mach/pm-core.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h index 9d8da51e3..7dbbfec 100644 --- a/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/arch/arm/mach-exynos/include/mach/pm-core.h @@ -27,13 +27,8 @@ static inline void s3c_pm_debug_init_uart(void) static inline void s3c_pm_arch_prepare_irqs(void) { - unsigned int tmp; - tmp = __raw_readl(S5P_WAKEUP_MASK); - tmp &= ~(1 << 31); - __raw_writel(tmp, S5P_WAKEUP_MASK); - - __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK); __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); + __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); } static inline void s3c_pm_arch_stop_clocks(void)