From patchwork Mon Dec 13 14:52:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 406432 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 oBDEqv42017169 for ; Mon, 13 Dec 2010 14:52:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757882Ab0LMOw4 (ORCPT ); Mon, 13 Dec 2010 09:52:56 -0500 Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]:34330 "EHLO na3sys009aog104.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757837Ab0LMOw4 (ORCPT ); Mon, 13 Dec 2010 09:52:56 -0500 Received: from source ([209.85.161.179]) by na3sys009aob104.postini.com ([74.125.148.12]) with SMTP ID DSNKTQYzR3V/1v018ZC2YOUoGe2QIRfgRIZQ@postini.com; Mon, 13 Dec 2010 06:52:55 PST Received: by gxk21 with SMTP id 21so3768035gxk.24 for ; Mon, 13 Dec 2010 06:52:55 -0800 (PST) Received: by 10.150.225.4 with SMTP id x4mr6331328ybg.104.1292251975012; Mon, 13 Dec 2010 06:52:55 -0800 (PST) Received: from [128.247.74.250] (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id p1sm3560371ybn.5.2010.12.13.06.52.53 (version=SSLv3 cipher=RC4-MD5); Mon, 13 Dec 2010 06:52:54 -0800 (PST) Message-ID: <4D063344.2010001@ti.com> Date: Mon, 13 Dec 2010 08:52:52 -0600 From: Nishanth Menon User-Agent: Thunderbird 2.0.0.24 (X11/20101027) MIME-Version: 1.0 To: Vishwanath Sripathy CC: linux-omap , Eduardo Valentin , Kevin Hilman , Tony Lindgren Subject: Re: [PATCH 5/5 v3] OMAP3630: PM: Erratum i583: disable coreoff if < ES1.2 References: <1291395818-8639-1-git-send-email-nm@ti.com> <1291395818-8639-6-git-send-email-nm@ti.com> <2cdf7d3d033ee2c88b6f2d4cfa37d9db@mail.gmail.com> <4D0622FE.2070801@ti.com> <4D062806.6090201@ti.com> <4D062F81.407@ti.com> <96505dfaee73d6785e153ccf5c2856d3@mail.gmail.com> <6f507e24d6ae188e265913e85e815f82@mail.gmail.com> In-Reply-To: <6f507e24d6ae188e265913e85e815f82@mail.gmail.com> 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, 13 Dec 2010 14:52:58 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index ba3c0d6..da12a56 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -932,8 +932,15 @@ void omap3_pm_off_mode_enable(int enable) #endif list_for_each_entry(pwrst, &pwrst_list, node) { - pwrst->next_state = state; - omap_set_pwrdm_state(pwrst->pwrdm, state); + if (IS_PM34XX_ERRATUM(SDRC_WAKEUP_ERRATUM_i583) && + pwrst->pwrdm == core_pwrdm) { + pwrst->next_state = PWRDM_POWER_RET; + pr_err("%s: cannot enable Core OFF due to i583\n", + __func__); + } else { + pwrst->next_state = state; + } + omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); } }