ARM: OMAP: Make 24xx timer check source clock instead of hardcoded value

Make 24xx timer check source clock instead of hardcoded value

diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index dbd867dd35ad22f624b3ce5b3ea632c5b0a448cb..1ea91681926c9b162883f363be8f7324d9987b6b 100644 (file)
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -20,9 +20,11 @@
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
+#include <linux/err.h>
 #include <asm/mach/time.h>
 #include <asm/delay.h>
 #include <asm/io.h>
+#include <asm/hardware/clock.h>
 
 #define OMAP2_GP_TIMER1_BASE   0x48028000
 #define OMAP2_GP_TIMER2_BASE   0x4802a000
@@ -56,6 +58,7 @@ static inline void timer_write_reg(int nr, unsigned int reg, unsigned int val)
        __raw_writel(val, timer_base[nr] + reg);
 }
 
+/* Note that we always enable the clock prescale divider bit */
 static inline void omap2_gp_timer_start(int nr, unsigned long load_val)
 {
        unsigned int tmp;
@@ -87,19 +90,34 @@ static struct irqaction omap2_gp_timer_irq = {
        .handler        = omap2_gp_timer_interrupt,
 };
 
-#define MPU_TIMER_TICK_PERIOD  (192000 - 1)
-
 static void __init omap2_gp_timer_init(void)
 {
+       struct clk * osc_ck;
+       u32 tick_period = 120000;
        u32 l;
 
+       /* Reset clock and prescale value */
+       timer_write_reg(OS_TIMER_NR, GP_TIMER_TCLR, 0);
+
+       osc_ck = clk_get(NULL, "osc_ck");
+       if (IS_ERR(osc_ck))
+               printk(KERN_ERR "Could not get osc_ck\n");
+       else {
+               clk_use(osc_ck);
+               tick_period = clk_get_rate(osc_ck) / 100;
+               clk_put(osc_ck);
+       }
+
+       tick_period /= 2;       /* Minimum prescale divider is 2 */
+       tick_period -= 1;
+
        l = timer_read_reg(OS_TIMER_NR, GP_TIMER_TIDR);
        printk(KERN_INFO "OMAP2 GP timer (HW version %d.%d)\n",
               (l >> 4) & 0x0f, l & 0x0f);
 
        setup_irq(38, &omap2_gp_timer_irq);
 
-       omap2_gp_timer_start(OS_TIMER_NR, MPU_TIMER_TICK_PERIOD);
+       omap2_gp_timer_start(OS_TIMER_NR, tick_period);
 }
 
 struct sys_timer omap_timer = {