aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/timer.c
diff options
context:
space:
mode:
authorPeter De Schrijver <pdeschrijver@nvidia.com>2011-12-14 10:03:16 -0500
committerOlof Johansson <olof@lixom.net>2011-12-17 23:15:08 -0500
commit8e4fab2c39b2db774e41553646788599cfdac9df (patch)
tree1c2a8e49c3af62f8ac0c6576b39bca79430c43e4 /arch/arm/mach-tegra/timer.c
parent742face03f57727b5a86d0df631e47a1ef0498d2 (diff)
arm/tegra: don't export clk_measure_input_freq
don't export clk_measure_input_freq as its functionality is also available using clk_get_rate(). Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Colin Cross <ccross@android.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/timer.c')
-rw-r--r--arch/arm/mach-tegra/timer.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 2f1df471c932..6366654b54c5 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -182,14 +182,18 @@ static struct irqaction tegra_timer_irq = {
182static void __init tegra_init_timer(void) 182static void __init tegra_init_timer(void)
183{ 183{
184 struct clk *clk; 184 struct clk *clk;
185 unsigned long rate = clk_measure_input_freq(); 185 unsigned long rate;
186 int ret; 186 int ret;
187 187
188 clk = clk_get_sys("timer", NULL); 188 clk = clk_get_sys("timer", NULL);
189 if (IS_ERR(clk)) 189 if (IS_ERR(clk)) {
190 pr_warn("Unable to get timer clock\n"); 190 pr_warn("Unable to get timer clock."
191 else 191 " Assuming 12Mhz input clock.\n");
192 rate = 12000000;
193 } else {
192 clk_enable(clk); 194 clk_enable(clk);
195 rate = clk_get_rate(clk);
196 }
193 197
194 /* 198 /*
195 * rtc registers are used by read_persistent_clock, keep the rtc clock 199 * rtc registers are used by read_persistent_clock, keep the rtc clock