Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / arch / arm / mach-u300 / timer.c

diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 26d26f5..3fc4472 100644 (file)
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -15,6 +15,8 @@
 #include <linux/clocksource.h>
 #include <linux/types.h>
 #include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
 
 #include <mach/hardware.h>
 
@@ -23,7 +25,8 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include "clock.h"
+/* Be able to sleep for atleast 4 seconds (usually more) */
+#define APPTIMER_MIN_RANGE 4
 
 /*
  * APP side special timer registers
@@ -307,8 +310,6 @@ static struct clock_event_device clockevent_u300_1mhz = {
        .name           = "GPT1",
        .rating         = 300, /* Reasonably fast and accurate clock event */
        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       /* 22 calculated using the algorithm in arch/mips/kernel/time.c */
-       .shift          = 22,
        .set_next_event = u300_set_next_event,
        .set_mode       = u300_set_mode,
 };
@@ -341,8 +342,6 @@ static struct clocksource clocksource_u300_1mhz = {
        .rating         = 300, /* Reasonably fast and accurate clock source */
        .read           = u300_get_cycles,
        .mask           = CLOCKSOURCE_MASK(32), /* 32 bits */
-       /* 22 calculated using the algorithm in arch/mips/kernel/time.c */
-       .shift          = 22,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -367,7 +366,15 @@ unsigned long long notrace sched_clock(void)
  */
 static void __init u300_timer_init(void)
 {
-       u300_enable_timer_clock();
+       struct clk *clk;
+       unsigned long rate;
+
+       /* Clock the interrupt controller */
+       clk = clk_get_sys("apptimer", NULL);
+       BUG_ON(IS_ERR(clk));
+       clk_enable(clk);
+       rate = clk_get_rate(clk);
+
        /*
         * Disable the "OS" and "DD" timers - these are designed for Symbian!
         * Example usage in cnh1601578 cpu subsystem pd_timer_app.c
@@ -405,15 +412,14 @@ static void __init u300_timer_init(void)
        writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE,
                U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2);
 
-       /* This is a pure microsecond clock source */
-       clocksource_u300_1mhz.mult =
-               clocksource_khz2mult(1000, clocksource_u300_1mhz.shift);
+       clocksource_calc_mult_shift(&clocksource_u300_1mhz,
+                                   rate, APPTIMER_MIN_RANGE);
        if (clocksource_register(&clocksource_u300_1mhz))
                printk(KERN_ERR "timer: failed to initialize clock "
                       "source %s\n", clocksource_u300_1mhz.name);
 
-       clockevent_u300_1mhz.mult =
-               div_sc(1000000, NSEC_PER_SEC, clockevent_u300_1mhz.shift);
+       clockevents_calc_mult_shift(&clockevent_u300_1mhz,
+                                   rate, APPTIMER_MIN_RANGE);
        /* 32bit counter, so 32bits delta is max */
        clockevent_u300_1mhz.max_delta_ns =
                clockevent_delta2ns(0xffffffff, &clockevent_u300_1mhz);