From patchwork Fri Jan 8 17:59:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 71827 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o08HxZHb023664 for ; Fri, 8 Jan 2010 17:59:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753641Ab0AHR7j (ORCPT ); Fri, 8 Jan 2010 12:59:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753640Ab0AHR7j (ORCPT ); Fri, 8 Jan 2010 12:59:39 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:63991 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753628Ab0AHR7i (ORCPT ); Fri, 8 Jan 2010 12:59:38 -0500 Received: by pzk1 with SMTP id 1so3897390pzk.33 for ; Fri, 08 Jan 2010 09:59:38 -0800 (PST) Received: by 10.141.107.16 with SMTP id j16mr3098200rvm.282.1262973577926; Fri, 08 Jan 2010 09:59:37 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 22sm18826709pzk.6.2010.01.08.09.59.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 08 Jan 2010 09:59:37 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: Tero Kristo Subject: [PATCH 02/13] OMAP3: PM: Ack pending interrupts before entering suspend Date: Fri, 8 Jan 2010 09:59:20 -0800 Message-Id: <1262973571-25796-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.6.rc2.1.g42108 In-Reply-To: <1262973571-25796-2-git-send-email-khilman@deeprootsystems.com> References: <1262973571-25796-1-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-2-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index e9bc782..54c5f0d 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -274,4 +274,10 @@ void omap_intc_restore_context(void) } /* MIRs are saved and restore with other PRCM registers */ } + +void omap3_intc_suspend(void) +{ + /* A pending interrupt would prevent OMAP from entering suspend */ + omap_ack_irq(0); +} #endif /* CONFIG_ARCH_OMAP3 */ diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index c6cc809..b26418d 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -578,6 +578,8 @@ static int omap3_pm_suspend(void) } omap_uart_prepare_suspend(); + omap3_intc_suspend(); + omap_sram_idle(); restore: diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 97d6c50..0082036 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -499,6 +499,7 @@ extern void omap_init_irq(void); extern int omap_irq_pending(void); void omap_intc_save_context(void); void omap_intc_restore_context(void); +void omap3_intc_suspend(void); #endif #include