From patchwork Mon Nov 22 19:36:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 348211 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAMKwFYH003614 for ; Mon, 22 Nov 2010 20:58:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757392Ab0KVTiK (ORCPT ); Mon, 22 Nov 2010 14:38:10 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:41751 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757361Ab0KVTiK (ORCPT ); Mon, 22 Nov 2010 14:38:10 -0500 Received: by ewy5 with SMTP id 5so1918880ewy.19 for ; Mon, 22 Nov 2010 11:38:08 -0800 (PST) Received: by 10.216.177.201 with SMTP id d51mr5416324wem.80.1290454687593; Mon, 22 Nov 2010 11:38:07 -0800 (PST) Received: from localhost.localdomain (133.61-245-81.adsl-dyn.isp.belgacom.be [81.245.61.133]) by mx.google.com with ESMTPS id p4sm2461555wej.28.2010.11.22.11.38.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 22 Nov 2010 11:38:06 -0800 (PST) From: jean.pihet@newoldbits.com To: linux-omap@vger.kernel.org Cc: Jean Pihet , Kevin Hilman Subject: [PATCH] OMAP3: disable idle during the entire suspend/resume sequence Date: Mon, 22 Nov 2010 20:36:43 +0100 Message-Id: <1290454603-5513-1-git-send-email-j-pihet@ti.com> X-Mailer: git-send-email 1.7.2.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 22 Nov 2010 20:58:19 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 75c0cd1..2e0621e 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -506,12 +506,6 @@ out: #ifdef CONFIG_SUSPEND static suspend_state_t suspend_state; -static int omap3_pm_prepare(void) -{ - disable_hlt(); - return 0; -} - static int omap3_pm_suspend(void) { struct power_state *pwrst; @@ -574,14 +568,10 @@ static int omap3_pm_enter(suspend_state_t unused) return ret; } -static void omap3_pm_finish(void) -{ - enable_hlt(); -} - /* Hooks to enable / disable UART interrupts during suspend */ static int omap3_pm_begin(suspend_state_t state) { + disable_hlt(); suspend_state = state; omap_uart_enable_irqs(0); return 0; @@ -591,15 +581,14 @@ static void omap3_pm_end(void) { suspend_state = PM_SUSPEND_ON; omap_uart_enable_irqs(1); + enable_hlt(); return; } static struct platform_suspend_ops omap_pm_ops = { .begin = omap3_pm_begin, .end = omap3_pm_end, - .prepare = omap3_pm_prepare, .enter = omap3_pm_enter, - .finish = omap3_pm_finish, .valid = suspend_valid_only_mem, }; #endif /* CONFIG_SUSPEND */