1 files changed, 22 insertions, 21 deletions

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 41b10725cef7..fd684bf205e5 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -25,7 +25,7 @@
 
 #include <asm/clkdev.h>
 #include <mach/clkdev.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
 #include <mach/lm.h>
 #include <mach/impd1.h>
 #include <asm/sizes.h>
@@ -41,32 +41,25 @@ struct impd1_module {
         struct clk_lookup *clks[3];
 };
 
-static const struct icst525_params impd1_vco_params = {
-        .ref            = 24000,        /* 24 MHz */
-        .vco_max        = 200000,       /* 200 MHz */
+static const struct icst_params impd1_vco_params = {
+        .ref            = 24000000,     /* 24 MHz */
+        .vco_max        = ICST525_VCO_MAX_3V,
+        .vco_min        = ICST525_VCO_MIN,
         .vd_min         = 12,
         .vd_max         = 519,
         .rd_min         = 3,
         .rd_max         = 120,
+        .s2div          = icst525_s2div,
+        .idx2s          = icst525_idx2s,
 };
 
-static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
+static void impd1_setvco(struct clk *clk, struct icst_vco vco)
 {
         struct impd1_module *impd1 = clk->data;
-        int vconr = clk - impd1->vcos;
-        u32 val;
-
-        val = vco.v | (vco.r << 9) | (vco.s << 16);
+        u32 val = vco.v | (vco.r << 9) | (vco.s << 16);
 
         writel(0xa05f, impd1->base + IMPD1_LOCK);
-        switch (vconr) {
-        case 0:
-                writel(val, impd1->base + IMPD1_OSC1);
-                break;
-        case 1:
-                writel(val, impd1->base + IMPD1_OSC2);
-                break;
-        }
+        writel(val, clk->vcoreg);
         writel(0, impd1->base + IMPD1_LOCK);
 
 #ifdef DEBUG
@@ -74,11 +67,17 @@ static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
         vco.r = (val >> 9) & 0x7f;
         vco.s = (val >> 16) & 7;
 
-        pr_debug("IM-PD1: VCO%d clock is %ld kHz\n",
-                 vconr, icst525_khz(&impd1_vco_params, vco));
+        pr_debug("IM-PD1: VCO%d clock is %ld Hz\n",
+                 vconr, icst525_hz(&impd1_vco_params, vco));
 #endif
 }
 
+static const struct clk_ops impd1_clk_ops = {
+        .round  = icst_clk_round,
+        .set    = icst_clk_set,
+        .setvco = impd1_setvco,
+};
+
 void impd1_tweak_control(struct device *dev, u32 mask, u32 val)
 {
         struct impd1_module *impd1 = dev_get_drvdata(dev);
@@ -374,11 +373,13 @@ static int impd1_probe(struct lm_device *dev)
                 (unsigned long)dev->resource.start);
 
         for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) {
+                impd1->vcos[i].ops = &impd1_clk_ops,
                 impd1->vcos[i].owner = THIS_MODULE,
                 impd1->vcos[i].params = &impd1_vco_params,
-                impd1->vcos[i].data = impd1,
-                impd1->vcos[i].setvco = impd1_setvco;
+                impd1->vcos[i].data = impd1;
         }
+        impd1->vcos[0].vcoreg = impd1->base + IMPD1_OSC1;
+        impd1->vcos[1].vcoreg = impd1->base + IMPD1_OSC2;
 
         impd1->clks[0] = clkdev_alloc(&impd1->vcos[0], NULL, "lm%x:01000",
                                         dev->id);