From patchwork Tue Jun 22 08:31:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "stanley.miao" X-Patchwork-Id: 107352 X-Patchwork-Delegate: khilman@deeprootsystems.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 o5M8Iwbp021393 for ; Tue, 22 Jun 2010 08:18:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754183Ab0FVIS5 (ORCPT ); Tue, 22 Jun 2010 04:18:57 -0400 Received: from mail.windriver.com ([147.11.1.11]:46217 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333Ab0FVIS4 (ORCPT ); Tue, 22 Jun 2010 04:18:56 -0400 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id o5M8ItEn004801 for ; Tue, 22 Jun 2010 01:18:55 -0700 (PDT) Received: from ala-mail06.corp.ad.wrs.com ([147.11.57.147]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 22 Jun 2010 01:18:55 -0700 Received: from localhost.localdomain ([128.224.163.169]) by ala-mail06.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 22 Jun 2010 01:18:55 -0700 From: "Stanley.Miao" To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP3 PM: fix the error messages printed when the system suspend Date: Tue, 22 Jun 2010 16:31:24 +0800 Message-Id: <1277195484-5501-1-git-send-email-stanley.miao@windriver.com> X-Mailer: git-send-email 1.5.6.3 X-OriginalArrivalTime: 22 Jun 2010 08:18:55.0453 (UTC) FILETIME=[8E66A0D0:01CB11E3] 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]); Tue, 22 Jun 2010 08:18:59 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 62529ff..d16648a 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -385,8 +385,9 @@ void omap_sram_idle(void) /* Enable IO-PAD and IO-CHAIN wakeups */ per_next_state = pwrdm_read_next_pwrst(per_pwrdm); core_next_state = pwrdm_read_next_pwrst(core_pwrdm); - if (per_next_state < PWRDM_POWER_ON || - core_next_state < PWRDM_POWER_ON) { + if (!cpu_is_omap3505() && !cpu_is_omap3517() && \ + (per_next_state < PWRDM_POWER_ON || \ + core_next_state < PWRDM_POWER_ON)) { prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN); omap3_enable_io_chain(); } @@ -479,7 +480,8 @@ void omap_sram_idle(void) } /* Disable IO-PAD and IO-CHAIN wakeup */ - if (core_next_state < PWRDM_POWER_ON) { + if ((core_next_state < PWRDM_POWER_ON) && \ + !cpu_is_omap3505() && !cpu_is_omap3517()) { prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN); omap3_disable_io_chain(); }