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 = {
 static void __init tegra_init_timer(void)
 {
         struct clk *clk;
-        unsigned long rate = clk_measure_input_freq();
+        unsigned long rate;
         int ret;
 
         clk = clk_get_sys("timer", NULL);
-        if (IS_ERR(clk))
-                pr_warn("Unable to get timer clock\n");
-        else
+        if (IS_ERR(clk)) {
+                pr_warn("Unable to get timer clock."
+                        " Assuming 12Mhz input clock.\n");
+                rate = 12000000;
+        } else {
                 clk_enable(clk);
+                rate = clk_get_rate(clk);
+        }
 
         /*
          * rtc registers are used by read_persistent_clock, keep the rtc clock