summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/clock.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-16 17:28:44 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-02 09:35:31 +0100
commit64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b (patch)
treeccf7b5a9fc9bbf65962b6bc7ba0d4adac0206c8e /arch/arm/mach-versatile/clock.c
parent4de2edbd15ff70c77e1d018611d06f7801fc2b72 (diff)
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>
Diffstat (limited to 'arch/arm/mach-versatile/clock.c')
-rw-r--r--arch/arm/mach-versatile/clock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c
index 530e16aa7ad..82753be453d 100644
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
@@ -43,8 +43,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);
@@ -55,8 +55,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;
}