From patchwork Fri Apr 17 05:57:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 18626 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 n3H5ww8q007272 for ; Fri, 17 Apr 2009 05:58:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755565AbZDQF6W (ORCPT ); Fri, 17 Apr 2009 01:58:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756162AbZDQF6W (ORCPT ); Fri, 17 Apr 2009 01:58:22 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:55777 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755565AbZDQF6V convert rfc822-to-8bit (ORCPT ); Fri, 17 Apr 2009 01:58:21 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id n3H5vtdf000572; Fri, 17 Apr 2009 00:58:01 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n3H5vsP5001463; Fri, 17 Apr 2009 11:27:54 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 17 Apr 2009 11:27:55 +0530 From: "Nayak, Rajendra" To: linux-omap CC: Jean Pihet Date: Fri, 17 Apr 2009 11:27:53 +0530 Subject: [PATCH 02/02] OMAP3 clock: Update cpufreq driver Thread-Topic: [PATCH 02/02] OMAP3 clock: Update cpufreq driver Thread-Index: Acm/IXLrVaqCc4NnQy+o+cn/WfutvQ== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FB251DD3@dbde02.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Rajendra Nayak This patch removes all refrences to virtual clock nodes in CPUFreq driver. Signed-off-by: Rajendra Nayak Signed-off-by: Tero Kristo Signed-off-by: Jean Pihet --- arch/arm/plat-omap/cpu-omap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-omap-2.6/arch/arm/plat-omap/cpu-omap.c =================================================================== --- linux-omap-2.6.orig/arch/arm/plat-omap/cpu-omap.c 2009-04-15 12:04:34.000000000 +0530 +++ linux-omap-2.6/arch/arm/plat-omap/cpu-omap.c 2009-04-15 12:30:29.000000000 +0530 @@ -40,7 +40,7 @@ static struct cpufreq_frequency_table *f #ifdef CONFIG_ARCH_OMAP1 #define MPU_CLK "mpu" #elif CONFIG_ARCH_OMAP3 -#define MPU_CLK "virt_vdd1_prcm_set" +#define MPU_CLK "arm_fck" #else #define MPU_CLK "virt_prcm_set" #endif @@ -82,7 +82,9 @@ static int omap_target(struct cpufreq_po unsigned int target_freq, unsigned int relation) { +#ifdef CONFIG_ARCH_OMAP1 struct cpufreq_freqs freqs; +#endif int ret = 0; /* Ensure desired rate is within allowed range. Some govenors @@ -92,13 +94,13 @@ static int omap_target(struct cpufreq_po if (target_freq > policy->cpuinfo.max_freq) target_freq = policy->cpuinfo.max_freq; +#ifdef CONFIG_ARCH_OMAP1 freqs.old = omap_getspeed(0); freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; freqs.cpu = 0; if (freqs.old == freqs.new) return ret; -#ifdef CONFIG_ARCH_OMAP1 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); #ifdef CONFIG_CPU_FREQ_DEBUG printk(KERN_DEBUG "cpufreq-omap: transition: %u --> %u\n", @@ -110,7 +112,7 @@ static int omap_target(struct cpufreq_po if (mpu_opps) { int ind; for (ind = 1; ind <= MAX_VDD1_OPP; ind++) { - if (mpu_opps[ind].rate/1000 >= freqs.new) { + if (mpu_opps[ind].rate/1000 >= target_freq) { omap_pm_cpu_set_freq (mpu_opps[ind].rate); break;