Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[pandora-kernel.git] / arch / arm / mach-netx / time.c

diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index f12f22d..e24c141 100644 (file)
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -104,19 +104,6 @@ static struct irqaction netx_timer_irq = {
        .handler        = netx_timer_interrupt,
 };
 
-cycle_t netx_get_cycles(struct clocksource *cs)
-{
-       return readl(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE));
-}
-
-static struct clocksource clocksource_netx = {
-       .name           = "netx_timer",
-       .rating         = 200,
-       .read           = netx_get_cycles,
-       .mask           = CLOCKSOURCE_MASK(32),
-       .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 /*
  * Set up timer interrupt
  */
@@ -150,7 +137,8 @@ static void __init netx_timer_init(void)
        writel(NETX_GPIO_COUNTER_CTRL_RUN,
                        NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE));
 
-       clocksource_register_hz(&clocksource_netx, CLOCK_TICK_RATE);
+       clocksource_mmio_init(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE),
+               "netx_timer", CLOCK_TICK_RATE, 200, 32, clocksource_mmio_readl_up);
 
        netx_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
                        netx_clockevent.shift);