From patchwork Mon Nov 22 10:44:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 347341 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 oAMAjrIn020718 for ; Mon, 22 Nov 2010 10:45:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754494Ab0KVKpw (ORCPT ); Mon, 22 Nov 2010 05:45:52 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:54592 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753303Ab0KVKpv (ORCPT ); Mon, 22 Nov 2010 05:45:51 -0500 Received: by wwa36 with SMTP id 36so7171213wwa.1 for ; Mon, 22 Nov 2010 02:45:50 -0800 (PST) Received: by 10.227.137.138 with SMTP id w10mr5707778wbt.19.1290422750075; Mon, 22 Nov 2010 02:45:50 -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 f14sm3189524wbe.8.2010.11.22.02.45.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 22 Nov 2010 02:45:48 -0800 (PST) From: Jean Pihet To: "linux-omap@vger.kernel.org" Cc: Jean Pihet , Kevin Hilman Subject: [PATCH] OMAP3: disable idle early in the suspend sequence Date: Mon, 22 Nov 2010 11:44:57 +0100 Message-Id: <1290422697-2300-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 10:45:59 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 75c0cd1..022fdff 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -508,7 +508,6 @@ static suspend_state_t suspend_state; static int omap3_pm_prepare(void) { - disable_hlt(); return 0; } @@ -576,12 +575,12 @@ static int omap3_pm_enter(suspend_state_t unused) 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,6 +590,7 @@ static void omap3_pm_end(void) { suspend_state = PM_SUSPEND_ON; omap_uart_enable_irqs(1); + enable_hlt(); return; }