diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 12:28:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:31 -0400 |
commit | 64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b (patch) | |
tree | ccf7b5a9fc9bbf65962b6bc7ba0d4adac0206c8e /arch/arm/mach-integrator/impd1.c | |
parent | 4de2edbd15ff70c77e1d018611d06f7801fc2b72 (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-integrator/impd1.c')
-rw-r--r-- | arch/arm/mach-integrator/impd1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 5aca7ebea3ce..ecce3eb8fe00 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -41,7 +41,7 @@ struct impd1_module { | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | static const struct icst_params impd1_vco_params = { | 43 | static const struct icst_params impd1_vco_params = { |
44 | .ref = 24000, /* 24 MHz */ | 44 | .ref = 24000000, /* 24 MHz */ |
45 | .vco_max = ICST525_VCO_MAX_3V, | 45 | .vco_max = ICST525_VCO_MAX_3V, |
46 | .vd_min = 12, | 46 | .vd_min = 12, |
47 | .vd_max = 519, | 47 | .vd_max = 519, |
@@ -73,8 +73,8 @@ static void impd1_setvco(struct clk *clk, struct icst_vco vco) | |||
73 | vco.r = (val >> 9) & 0x7f; | 73 | vco.r = (val >> 9) & 0x7f; |
74 | vco.s = (val >> 16) & 7; | 74 | vco.s = (val >> 16) & 7; |
75 | 75 | ||
76 | pr_debug("IM-PD1: VCO%d clock is %ld kHz\n", | 76 | pr_debug("IM-PD1: VCO%d clock is %ld Hz\n", |
77 | vconr, icst525_khz(&impd1_vco_params, vco)); | 77 | vconr, icst525_hz(&impd1_vco_params, vco)); |
78 | #endif | 78 | #endif |
79 | } | 79 | } |
80 | 80 | ||