From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kevin Hilman <khilman@deeprootsystems.com>
Subject: Re: [PATCH v5 6/7] OMAP3: PM: make omap3_cpuidle_update_states independent of enable_off_mode
Date: Mon, 20 Dec 2010 16:44:26 -0800
Message-ID: <87mxo02bv9.fsf@deeprootsystems.com>
References: <1292875509-9896-1-git-send-email-nm@ti.com>
	<1292875509-9896-7-git-send-email-nm@ti.com>
	<87hbe83tcy.fsf@deeprootsystems.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-omap-owner@vger.kernel.org>
Received: from mail-iy0-f174.google.com ([209.85.210.174]:55828 "EHLO
	mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932628Ab0LUAoc (ORCPT
	<rfc822;linux-omap@vger.kernel.org>); Mon, 20 Dec 2010 19:44:32 -0500
Received: by iyi12 with SMTP id 12so2689423iyi.19
        for <linux-omap@vger.kernel.org>; Mon, 20 Dec 2010 16:44:31 -0800 (PST)
In-Reply-To: <87hbe83tcy.fsf@deeprootsystems.com> (Kevin Hilman's message of
	"Mon, 20 Dec 2010 15:41:17 -0800")
Sender: linux-omap-owner@vger.kernel.org
List-Id: linux-omap@vger.kernel.org
To: Nishanth Menon <nm@ti.com>
Cc: linux-omap <linux-omap@vger.kernel.org>, linux-arm <linux-arm-kernel@lists.infradead.org>, Jean Pihet <jean.pihet@newoldbits.com>, Tony <tony@atomide.com>, Santosh <santosh.shilimkar@ti.com>

Kevin Hilman <khilman@deeprootsystems.com> writes:

> Nishanth Menon <nm@ti.com> writes:
>
>> Currently omap3_cpuidle_update_states makes whole sale decision
>> on which C states to update based on enable_off_mode variable
>> Instead, achieve the same functionality by independently providing
>> mpu and core deepest states the system is allowed to achieve and
>> update the idle states accordingly.
>>
>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> Acked-by: Jean Pihet <j-pihet@ti.com>
>>
>> Signed-off-by: Nishanth Menon <nm@ti.com>
>
> This patch doesnt' compile with CPUidle enabled.
>
> You missed one other caller of the update_states function inside
> cpuidle34xx.c which is only there when CONFIG_CPU_IDLE=y
>

Something like the following folded into this patch makes it compile and
work as before.

If this looks OK to you, I'll fold it in.

Kevin

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx
index ab4c862..0fb619c 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -517,7 +517,10 @@ int __init omap3_idle_init(void)
                return -EINVAL;
        dev->state_count = count;
 
-       omap3_cpuidle_update_states();
+       if (enable_off_mode)
+               omap3_cpuidle_update_states(PWRDM_POWER_OFF, PWRDM_POWER_OFF);
+       else
+               omap3_cpuidle_update_states(PWRDM_POWER_RET, PWRDM_POWER_RET);
 
        if (cpuidle_register_device(dev)) {
                printk(KERN_ERR "%s: CPUidle register device failed\n",