1 files changed, 30 insertions, 23 deletions

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 44d4c2e8207b..1cb222daa06d 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -20,32 +20,39 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
+#include <mach/platform.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
 
 static struct cpufreq_driver integrator_driver;
 
-#define CM_ID   (IO_ADDRESS(INTEGRATOR_HDR_BASE)+INTEGRATOR_HDR_ID_OFFSET)
-#define CM_OSC  (IO_ADDRESS(INTEGRATOR_HDR_BASE)+INTEGRATOR_HDR_OSC_OFFSET)
-#define CM_STAT (IO_ADDRESS(INTEGRATOR_HDR_BASE)+INTEGRATOR_HDR_STAT_OFFSET)
-#define CM_LOCK (IO_ADDRESS(INTEGRATOR_HDR_BASE)+INTEGRATOR_HDR_LOCK_OFFSET)
+#define CM_ID   IO_ADDRESS(INTEGRATOR_HDR_ID)
+#define CM_OSC  IO_ADDRESS(INTEGRATOR_HDR_OSC)
+#define CM_STAT IO_ADDRESS(INTEGRATOR_HDR_STAT)
+#define CM_LOCK IO_ADDRESS(INTEGRATOR_HDR_LOCK)
 
-static const struct icst525_params lclk_params = {
-        .ref            = 24000,
-        .vco_max        = 320000,
+static const struct icst_params lclk_params = {
+        .ref            = 24000000,
+        .vco_max        = ICST525_VCO_MAX_5V,
+        .vco_min        = ICST525_VCO_MIN,
         .vd_min         = 8,
         .vd_max         = 132,
         .rd_min         = 24,
         .rd_max         = 24,
+        .s2div          = icst525_s2div,
+        .idx2s          = icst525_idx2s,
 };
 
-static const struct icst525_params cclk_params = {
-        .ref            = 24000,
-        .vco_max        = 320000,
+static const struct icst_params cclk_params = {
+        .ref            = 24000000,
+        .vco_max        = ICST525_VCO_MAX_5V,
+        .vco_min        = ICST525_VCO_MIN,
         .vd_min         = 12,
         .vd_max         = 160,
         .rd_min         = 24,
         .rd_max         = 24,
+        .s2div          = icst525_s2div,
+        .idx2s          = icst525_idx2s,
 };
 
 /*
@@ -53,17 +60,17 @@ static const struct icst525_params cclk_params = {
  */
 static int integrator_verify_policy(struct cpufreq_policy *policy)
 {
-        struct icst525_vco vco;
+        struct icst_vco vco;
 
         cpufreq_verify_within_limits(policy, 
                                      policy->cpuinfo.min_freq, 
                                      policy->cpuinfo.max_freq);
 
-        vco = icst525_khz_to_vco(&cclk_params, policy->max);
-        policy->max = icst525_khz(&cclk_params, vco);
+        vco = icst_hz_to_vco(&cclk_params, policy->max * 1000);
+        policy->max = icst_hz(&cclk_params, vco) / 1000;
 
-        vco = icst525_khz_to_vco(&cclk_params, policy->min);
-        policy->min = icst525_khz(&cclk_params, vco);
+        vco = icst_hz_to_vco(&cclk_params, policy->min * 1000);
+        policy->min = icst_hz(&cclk_params, vco) / 1000;
 
         cpufreq_verify_within_limits(policy, 
                                      policy->cpuinfo.min_freq, 
@@ -79,7 +86,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
 {
         cpumask_t cpus_allowed;
         int cpu = policy->cpu;
-        struct icst525_vco vco;
+        struct icst_vco vco;
         struct cpufreq_freqs freqs;
         u_int cm_osc;
 
@@ -105,17 +112,17 @@ static int integrator_set_target(struct cpufreq_policy *policy,
         }
         vco.v = cm_osc & 255;
         vco.r = 22;
-        freqs.old = icst525_khz(&cclk_params, vco);
+        freqs.old = icst_hz(&cclk_params, vco) / 1000;
 
-        /* icst525_khz_to_vco rounds down -- so we need the next
+        /* icst_hz_to_vco rounds down -- so we need the next
          * larger freq in case of CPUFREQ_RELATION_L.
          */
         if (relation == CPUFREQ_RELATION_L)
                 target_freq += 999;
         if (target_freq > policy->max)
                 target_freq = policy->max;
-        vco = icst525_khz_to_vco(&cclk_params, target_freq);
-        freqs.new = icst525_khz(&cclk_params, vco);
+        vco = icst_hz_to_vco(&cclk_params, target_freq * 1000);
+        freqs.new = icst_hz(&cclk_params, vco) / 1000;
 
         freqs.cpu = policy->cpu;
 
@@ -155,7 +162,7 @@ static unsigned int integrator_get(unsigned int cpu)
         cpumask_t cpus_allowed;
         unsigned int current_freq;
         u_int cm_osc;
-        struct icst525_vco vco;
+        struct icst_vco vco;
 
         cpus_allowed = current->cpus_allowed;
 
@@ -173,7 +180,7 @@ static unsigned int integrator_get(unsigned int cpu)
         vco.v = cm_osc & 255;
         vco.r = 22;
 
-        current_freq = icst525_khz(&cclk_params, vco); /* current freq */
+        current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */
 
         set_cpus_allowed(current, cpus_allowed);