From: Rajendra Nayak <rnayak@xxxxxx> This patch removes all refrences to virtual clock nodes in CPUFreq driver. Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxx> --- arch/arm/plat-omap/cpu-omap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: linux-omap-pm/arch/arm/plat-omap/cpu-omap.c =================================================================== --- linux-omap-pm.orig/arch/arm/plat-omap/cpu-omap.c 2009-03-20 16:55:21.967545328 +0530 +++ linux-omap-pm/arch/arm/plat-omap/cpu-omap.c 2009-03-20 16:55:37.038096798 +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 @@ -92,13 +92,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 +110,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;-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html