Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: OMAP: remove loops_per_jiffy recalculate for smp
  sections: fix section conflicts in drivers/cpufreq
  cpufreq: conservative: update frequency when limits are relaxed
  cpufreq / ondemand: update frequency when limits are relaxed
  cpufreq: Add a generic cpufreq-cpu0 driver
  PM / OPP: Initialize OPP table from device tree
  ARM: add cpufreq transiton notifier to adjust loops_per_jiffy for smp
  cpufreq: Remove support for hardware P-state chips from powernow-k8
  acpi-cpufreq: Add compatibility for legacy AMD cpb sysfs knob
  acpi-cpufreq: Add support for disabling dynamic overclocking
  ACPI: Add fixups for AMD P-state figures
  powernow-k8: delay info messages until initialization has succeeded
  cpufreq: Add warning message to powernow-k8
  acpi-cpufreq: Add quirk to disable _PSD usage on all AMD CPUs
  acpi-cpufreq: Add support for modern AMD CPUs
  cpufreq / powernow-k8: Fixup missing _PSS objects message
  PM / cpufreq: Initialise the cpu field during conservative governor start

1 files changed, 0 insertions, 35 deletions

diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index b47034e650a5..6e22f4481c07 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -40,16 +40,6 @@
 /* OPP tolerance in percentage */
 #define OPP_TOLERANCE   4
 
-#ifdef CONFIG_SMP
-struct lpj_info {
-        unsigned long   ref;
-        unsigned int    freq;
-};
-
-static DEFINE_PER_CPU(struct lpj_info, lpj_ref);
-static struct lpj_info global_lpj_ref;
-#endif
-
 static struct cpufreq_frequency_table *freq_table;
 static atomic_t freq_table_users = ATOMIC_INIT(0);
 static struct clk *mpu_clk;
@@ -161,31 +151,6 @@ static int omap_target(struct cpufreq_policy *policy,
         }
 
         freqs.new = omap_getspeed(policy->cpu);
-#ifdef CONFIG_SMP
-        /*
-         * Note that loops_per_jiffy is not updated on SMP systems in
-         * cpufreq driver. So, update the per-CPU loops_per_jiffy value
-         * on frequency transition. We need to update all dependent CPUs.
-         */
-        for_each_cpu(i, policy->cpus) {
-                struct lpj_info *lpj = &per_cpu(lpj_ref, i);
-                if (!lpj->freq) {
-                        lpj->ref = per_cpu(cpu_data, i).loops_per_jiffy;
-                        lpj->freq = freqs.old;
-                }
-
-                per_cpu(cpu_data, i).loops_per_jiffy =
-                        cpufreq_scale(lpj->ref, lpj->freq, freqs.new);
-        }
-
-        /* And don't forget to adjust the global one */
-        if (!global_lpj_ref.freq) {
-                global_lpj_ref.ref = loops_per_jiffy;
-                global_lpj_ref.freq = freqs.old;
-        }
-        loops_per_jiffy = cpufreq_scale(global_lpj_ref.ref, global_lpj_ref.freq,
-                                        freqs.new);
-#endif
 
 done:
         /* notifiers */