2 files changed, 4 insertions, 52 deletions

diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index 46adca068f2c..dc26fff22cf0 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -5,6 +5,7 @@ menu "Footbridge Implementations"
 config ARCH_CATS
         bool "CATS"
         select CLKSRC_I8253
+        select CLKEVT_I8253
         select FOOTBRIDGE_HOST
         select ISA
         select ISA_DMA
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index 71fd96df7f73..c40bb415f4b5 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -5,12 +5,10 @@
  *  Copyright (C) 1998 Phil Blundell
  */
 #include <linux/clockchips.h>
-#include <linux/clocksource.h>
 #include <linux/i8253.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/timex.h>
 
@@ -19,48 +17,6 @@
 
 #include "common.h"
 
-static void pit_set_mode(enum clock_event_mode mode,
-        struct clock_event_device *evt)
-{
-        unsigned long flags;
-
-        raw_local_irq_save(flags);
-
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                outb_p(0x34, PIT_MODE);
-                outb_p(PIT_LATCH & 0xff, PIT_CH0);
-                outb_p(PIT_LATCH >> 8, PIT_CH0);
-                break;
-
-        case CLOCK_EVT_MODE_SHUTDOWN:
-        case CLOCK_EVT_MODE_UNUSED:
-                outb_p(0x30, PIT_MODE);
-                outb_p(0, PIT_CH0);
-                outb_p(0, PIT_CH0);
-                break;
-
-        case CLOCK_EVT_MODE_ONESHOT:
-        case CLOCK_EVT_MODE_RESUME:
-                break;
-        }
-        local_irq_restore(flags);
-}
-
-static int pit_set_next_event(unsigned long delta,
-        struct clock_event_device *evt)
-{
-        return 0;
-}
-
-static struct clock_event_device pit_ce = {
-        .name           = "pit",
-        .features       = CLOCK_EVT_FEAT_PERIODIC,
-        .set_mode       = pit_set_mode,
-        .set_next_event = pit_set_next_event,
-        .shift          = 32,
-};
-
 static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *ce = dev_id;
@@ -72,20 +28,15 @@ static struct irqaction pit_timer_irq = {
         .name           = "pit",
         .handler        = pit_timer_interrupt,
         .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-        .dev_id         = &pit_ce,
+        .dev_id         = &i8253_clockevent,
 };
 
 static void __init isa_timer_init(void)
 {
-        pit_ce.cpumask = cpumask_of(smp_processor_id());
-        pit_ce.mult = div_sc(PIT_TICK_RATE, NSEC_PER_SEC, pit_ce.shift);
-        pit_ce.max_delta_ns = clockevent_delta2ns(0x7fff, &pit_ce);
-        pit_ce.min_delta_ns = clockevent_delta2ns(0x000f, &pit_ce);
-
         clocksource_i8253_init();
 
-        setup_irq(pit_ce.irq, &pit_timer_irq);
-        clockevents_register_device(&pit_ce);
+        setup_irq(i8253_clockevent.irq, &pit_timer_irq);
+        clockevent_i8253_init(false);
 }
 
 struct sys_timer isa_timer = {