ARM: ICST: kill duplicate icst code

[pandora-kernel.git] / arch / arm / mach-versatile / clock.c

diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c
index c50a44e..adc67d7 100644 (file)
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
@@ -19,7 +19,7 @@
 #include <linux/mutex.h>
 
 #include <asm/clkdev.h>
-#include <asm/hardware/icst307.h>
+#include <asm/hardware/icst.h>
 
 #include "clock.h"
 
@@ -42,9 +42,9 @@ EXPORT_SYMBOL(clk_get_rate);
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
-       struct icst307_vco vco;
-       vco = icst307_khz_to_vco(clk->params, rate / 1000);
-       return icst307_khz(clk->params, vco) * 1000;
+       struct icst_vco vco;
+       vco = icst_hz_to_vco(clk->params, rate);
+       return icst_hz(clk->params, vco);
 }
 EXPORT_SYMBOL(clk_round_rate);
 
@@ -53,10 +53,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
        int ret = -EIO;
 
        if (clk->setvco) {
-               struct icst307_vco vco;
+               struct icst_vco vco;
 
-               vco = icst307_khz_to_vco(clk->params, rate / 1000);
-               clk->rate = icst307_khz(clk->params, vco) * 1000;
+               vco = icst_hz_to_vco(clk->params, rate);
+               clk->rate = icst_hz(clk->params, vco);
                clk->setvco(clk, vco);
                ret = 0;
        }