From patchwork Fri Oct 23 16:59:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 55595 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9NGxghu026410 for ; Fri, 23 Oct 2009 16:59:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752736AbZJWQ7g (ORCPT ); Fri, 23 Oct 2009 12:59:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752731AbZJWQ7g (ORCPT ); Fri, 23 Oct 2009 12:59:36 -0400 Received: from qw-out-2122.google.com ([74.125.92.25]:11746 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752724AbZJWQ7f (ORCPT ); Fri, 23 Oct 2009 12:59:35 -0400 Received: by qw-out-2122.google.com with SMTP id 9so1391355qwb.37 for ; Fri, 23 Oct 2009 09:59:40 -0700 (PDT) Received: by 10.224.32.7 with SMTP id a7mr4877491qad.308.1256317180546; Fri, 23 Oct 2009 09:59:40 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 4sm8543802qwe.27.2009.10.23.09.59.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 23 Oct 2009 09:59:39 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Jouni Hogander Subject: [PATCH 08/10] OMAP3: PM: Use pwrdm_set_next_pwrst instead of set_pwrdm_state in idle loop Date: Fri, 23 Oct 2009 09:59:06 -0700 Message-Id: <1256317148-25506-9-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <1256317148-25506-8-git-send-email-khilman@deeprootsystems.com> References: <1256317148-25506-1-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-2-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-3-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-4-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-5-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-6-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-7-git-send-email-khilman@deeprootsystems.com> <1256317148-25506-8-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 5128b8c..1d10c4a 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -110,8 +110,8 @@ static int omap3_enter_idle(struct cpuidle_device *dev, core_state = PWRDM_POWER_RET; } - set_pwrdm_state(mpu_pd, mpu_state); - set_pwrdm_state(core_pd, core_state); + pwrdm_set_next_pwrst(mpu_pd, mpu_state); + pwrdm_set_next_pwrst(core_pd, core_state); if (omap_irq_pending()) goto return_sleep_time; diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index a6624a1..35c917e 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -359,7 +359,7 @@ void omap_sram_idle(void) /* NEON control */ if (pwrdm_read_pwrst(neon_pwrdm) == PWRDM_POWER_ON) - set_pwrdm_state(neon_pwrdm, mpu_next_state); + pwrdm_set_next_pwrst(neon_pwrdm, mpu_next_state); /* PER */ per_next_state = pwrdm_read_next_pwrst(per_pwrdm);