ARM: ICST: use Hz instead of kHz

This makes the ICST support fit more nicely with the clk API,
eliminating the need to *1000 and /1000 in places.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c
index 83646579bc4..2ba0667d18f 100644
--- a/arch/arm/mach-realview/clock.c
+++ b/arch/arm/mach-realview/clock.c
@@ -42,8 +42,8 @@ EXPORT_SYMBOL(clk_get_rate);
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
         struct icst_vco vco;
-        vco = icst307_khz_to_vco(clk->params, rate / 1000);
-        return icst307_khz(clk->params, vco) * 1000;
+        vco = icst307_hz_to_vco(clk->params, rate);
+        return icst307_hz(clk->params, vco);
 }
 EXPORT_SYMBOL(clk_round_rate);
 
@@ -54,8 +54,8 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
         if (clk->setvco) {
                 struct icst_vco vco;
 
-                vco = icst307_khz_to_vco(clk->params, rate / 1000);
-                clk->rate = icst307_khz(clk->params, vco) * 1000;
+                vco = icst307_hz_to_vco(clk->params, rate);
+                clk->rate = icst307_hz(clk->params, vco);
                 clk->setvco(clk, vco);
                 ret = 0;
         }
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 5a850f0dc36..02d48371c09 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -274,7 +274,7 @@ struct mmci_platform_data realview_mmc1_plat_data = {
  * Clock handling
  */
 static const struct icst_params realview_oscvco_params = {
-        .ref            = 24000,
+        .ref            = 24000000,
         .vco_max        = ICST307_VCO_MAX,
         .vd_min         = 4 + 8,
         .vd_max         = 511 + 8,