Merge back earlier cpufreq material.

Conflicts:
	arch/mips/loongson/lemote-2f/clock.c
	drivers/cpufreq/intel_pstate.c

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index db2e45b4808e..aebd4572eb6d 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -32,8 +32,6 @@
 #include <asm/msr.h>
 #include <asm/cpu_device_id.h>
 
-#define SAMPLE_COUNT            3
-
 #define BYT_RATIOS              0x66a
 #define BYT_VIDS                0x66b
 #define BYT_TURBO_RATIOS        0x66c
@@ -90,8 +88,6 @@ struct _pid {
 struct cpudata {
         int cpu;
 
-        char name[64];
-
         struct timer_list timer;
 
         struct pstate_data pstate;
@@ -549,8 +545,6 @@ static inline void intel_pstate_pstate_decrease(struct cpudata *cpu, int steps)
 
 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
 {
-        sprintf(cpu->name, "Intel 2nd generation core");
-
         cpu->pstate.min_pstate = pstate_funcs.get_min();
         cpu->pstate.max_pstate = pstate_funcs.get_max();
         cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
@@ -560,9 +554,9 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
         intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
 }
 
-static inline void intel_pstate_calc_busy(struct cpudata *cpu,
-                                        struct sample *sample)
+static inline void intel_pstate_calc_busy(struct cpudata *cpu)
 {
+        struct sample *sample = &cpu->sample;
         int64_t core_pct;
         int32_t rem;
 
@@ -595,7 +589,7 @@ static inline void intel_pstate_sample(struct cpudata *cpu)
         cpu->sample.aperf -= cpu->prev_aperf;
         cpu->sample.mperf -= cpu->prev_mperf;
 
-        intel_pstate_calc_busy(cpu, &cpu->sample);
+        intel_pstate_calc_busy(cpu);
 
         cpu->prev_aperf = aperf;
         cpu->prev_mperf = mperf;
@@ -684,10 +678,13 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(0x37, byt_params),
         ICPU(0x3a, core_params),
         ICPU(0x3c, core_params),
+        ICPU(0x3d, core_params),
         ICPU(0x3e, core_params),
         ICPU(0x3f, core_params),
         ICPU(0x45, core_params),
         ICPU(0x46, core_params),
+        ICPU(0x4f, core_params),
+        ICPU(0x56, core_params),
         {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);