summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
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/include
parent4de2edbd15ff70c77e1d018611d06f7801fc2b72 (diff)
downloadblackbird-op-linux-64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b.tar.gz
blackbird-op-linux-64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b.zip
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/include')
-rw-r--r--arch/arm/include/asm/hardware/icst307.h8
-rw-r--r--arch/arm/include/asm/hardware/icst525.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/include/asm/hardware/icst307.h b/arch/arm/include/asm/hardware/icst307.h
index 0c4e37e3fdef..0f096181e832 100644
--- a/arch/arm/include/asm/hardware/icst307.h
+++ b/arch/arm/include/asm/hardware/icst307.h
@@ -18,14 +18,14 @@
#include <asm/hardware/icst.h>
-unsigned long icst307_khz(const struct icst_params *p, struct icst_vco vco);
-struct icst_vco icst307_khz_to_vco(const struct icst_params *p, unsigned long freq);
+unsigned long icst307_hz(const struct icst_params *p, struct icst_vco vco);
+struct icst_vco icst307_hz_to_vco(const struct icst_params *p, unsigned long freq);
/*
* ICST307 VCO frequency must be between 6MHz and 200MHz (3.3 or 5V).
* This frequency is pre-output divider.
*/
-#define ICST307_VCO_MIN 6000
-#define ICST307_VCO_MAX 200000
+#define ICST307_VCO_MIN 6000000
+#define ICST307_VCO_MAX 200000000
#endif
diff --git a/arch/arm/include/asm/hardware/icst525.h b/arch/arm/include/asm/hardware/icst525.h
index 3b72c132e24f..1000a6096fcb 100644
--- a/arch/arm/include/asm/hardware/icst525.h
+++ b/arch/arm/include/asm/hardware/icst525.h
@@ -16,15 +16,15 @@
#include <asm/hardware/icst.h>
-unsigned long icst525_khz(const struct icst_params *p, struct icst_vco vco);
-struct icst_vco icst525_khz_to_vco(const struct icst_params *p, unsigned long freq);
+unsigned long icst525_hz(const struct icst_params *p, struct icst_vco vco);
+struct icst_vco icst525_hz_to_vco(const struct icst_params *p, unsigned long freq);
/*
* ICST525 VCO frequency must be between 10MHz and 200MHz (3V) or 320MHz (5V).
* This frequency is pre-output divider.
*/
-#define ICST525_VCO_MIN 10000
-#define ICST525_VCO_MAX_3V 200000
-#define ICST525_VCO_MAX_5V 320000
+#define ICST525_VCO_MIN 10000000
+#define ICST525_VCO_MAX_3V 200000000
+#define ICST525_VCO_MAX_5V 320000000
#endif
OpenPOWER on IntegriCloud