Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 0fcb1eb..9035042 100644 (file)
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -98,11 +98,6 @@ static void tegra_timer_set_mode(enum clock_event_mode mode,
        }
 }
 
-static cycle_t tegra_clocksource_read(struct clocksource *cs)
-{
-       return timer_readl(TIMERUS_CNTR_1US);
-}
-
 static struct clock_event_device tegra_clockevent = {
        .name           = "timer0",
        .rating         = 300,
@@ -111,14 +106,6 @@ static struct clock_event_device tegra_clockevent = {
        .set_mode       = tegra_timer_set_mode,
 };
 
-static struct clocksource tegra_clocksource = {
-       .name   = "timer_us",
-       .rating = 300,
-       .read   = tegra_clocksource_read,
-       .mask   = CLOCKSOURCE_MASK(32),
-       .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static DEFINE_CLOCK_DATA(cd);
 
 /*
@@ -234,7 +221,8 @@ static void __init tegra_init_timer(void)
        init_fixed_sched_clock(&cd, tegra_update_sched_clock, 32,
                               1000000, SC_MULT, SC_SHIFT);
 
-       if (clocksource_register_hz(&tegra_clocksource, 1000000)) {
+       if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,
+               "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) {
                printk(KERN_ERR "Failed to register clocksource\n");
                BUG();
        }