From patchwork Thu Aug 12 10:35:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ameya Palande X-Patchwork-Id: 119230 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7CAZeOx023344 for ; Thu, 12 Aug 2010 10:35:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759707Ab0HLKfj (ORCPT ); Thu, 12 Aug 2010 06:35:39 -0400 Received: from smtp.nokia.com ([192.100.122.233]:44586 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754570Ab0HLKfi (ORCPT ); Thu, 12 Aug 2010 06:35:38 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o7CAZPOT031677; Thu, 12 Aug 2010 13:35:30 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 12 Aug 2010 13:35:29 +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.4675); Thu, 12 Aug 2010 13:35:28 +0300 Received: from [172.21.22.49] (helruo-dhcp02249.ntc.nokia.com [172.21.22.49]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o7CAZPMN028537; Thu, 12 Aug 2010 13:35:26 +0300 Subject: Re: [PATCH v2] OMAP3: PM: ensure IO wakeups are properly disabled From: Ameya Palande To: ext Kevin Hilman Cc: "linux-omap@vger.kernel.org" , Paul Walmsley In-Reply-To: <1281542626-4045-1-git-send-email-khilman@deeprootsystems.com> References: <1281542626-4045-1-git-send-email-khilman@deeprootsystems.com> Organization: Nokia Oyj Date: Thu, 12 Aug 2010 13:35:24 +0300 Message-ID: <1281609324.1861.6.camel@chotu> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-OriginalArrivalTime: 12 Aug 2010 10:35:29.0114 (UTC) FILETIME=[154553A0:01CB3A0A] X-Nokia-AV: Clean 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 (demeter.kernel.org [140.211.167.41]); Thu, 12 Aug 2010 10:35:40 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index b88737f..887242d 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -479,7 +479,8 @@ void omap_sram_idle(void) } /* Disable IO-PAD and IO-CHAIN wakeup */ - if (core_next_state < PWRDM_POWER_ON) { + if (per_next_state < PWRDM_POWER_ON || + core_next_state < PWRDM_POWER_ON) { prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN); omap3_disable_io_chain();