From patchwork Fri Oct 23 16:03:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 55571 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9NGIbKk017206 for ; Fri, 23 Oct 2009 16:18:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752497AbZJWQSc (ORCPT ); Fri, 23 Oct 2009 12:18:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752488AbZJWQSb (ORCPT ); Fri, 23 Oct 2009 12:18:31 -0400 Received: from smtp.nokia.com ([192.100.122.230]:21473 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752484AbZJWQSb (ORCPT ); Fri, 23 Oct 2009 12:18:31 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n9NGIXnP001657 for ; Fri, 23 Oct 2009 19:18:33 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 Oct 2009 19:18:33 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 Oct 2009 19:18:32 +0300 Received: from localhost.localdomain (sokoban.ntc.nokia.com [172.22.144.95]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n9NGIPi8022176 for ; Fri, 23 Oct 2009 19:18:30 +0300 From: Tero Kristo To: linux-omap@vger.kernel.org Subject: [PATCH 04/11] OMAP3: PM: Ack pending interrupts before entering suspend Date: Fri, 23 Oct 2009 19:03:48 +0300 Message-Id: <1256313835-2391-5-git-send-email-tero.kristo@nokia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1256313835-2391-4-git-send-email-tero.kristo@nokia.com> References: <> <1256313835-2391-1-git-send-email-tero.kristo@nokia.com> <1256313835-2391-2-git-send-email-tero.kristo@nokia.com> <1256313835-2391-3-git-send-email-tero.kristo@nokia.com> <1256313835-2391-4-git-send-email-tero.kristo@nokia.com> X-OriginalArrivalTime: 23 Oct 2009 16:18:32.0683 (UTC) FILETIME=[76FFF3B0:01CA53FC] X-Nokia-AV: Clean 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 aceedd8..ee8c68a 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -266,4 +266,10 @@ void omap3_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 6782792..53544d3 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -640,7 +640,7 @@ static int omap3_pm_suspend(void) } omap_uart_prepare_suspend(); - + omap3_intc_suspend(); regset_save_on_suspend = 1; omap_sram_idle(); regset_save_on_suspend = 0; diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h index 2473910..ff1faa8 100644 --- a/arch/arm/plat-omap/include/mach/irqs.h +++ b/arch/arm/plat-omap/include/mach/irqs.h @@ -485,6 +485,7 @@ extern void omap_init_irq(void); extern int omap_irq_pending(void); void omap3_intc_save_context(void); void omap3_intc_restore_context(void); +void omap3_intc_suspend(void); #endif #include