2 files changed, 21 insertions, 24 deletions

diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index 59703c6fb29b..06206ceb312e 100644
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -29,9 +29,8 @@ static irqreturn_t ssp_interrupt(int irq, void *dev_id)
 {
         unsigned int status = Ser4SSSR;
 
-        if (status & SSSR_ROR) {
+        if (status & SSSR_ROR)
                 printk(KERN_WARNING "SSP: receiver overrun\n");
-        }
 
         Ser4SSSR = SSSR_ROR;
 
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index fdf7b016e7ad..c2677368d6af 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/timex.h>
 #include <linux/signal.h>
+#include <linux/clocksource.h>
 
 #include <asm/mach/time.h>
 #include <asm/hardware.h>
@@ -35,23 +36,6 @@ static int sa1100_set_rtc(void)
         return 0;
 }
 
-/* IRQs are disabled before entering here from do_gettimeofday() */
-static unsigned long sa1100_gettimeoffset (void)
-{
-        unsigned long ticks_to_match, elapsed, usec;
-
-        /* Get ticks before next timer match */
-        ticks_to_match = OSMR0 - OSCR;
-
-        /* We need elapsed ticks since last match */
-        elapsed = LATCH - ticks_to_match;
-
-        /* Now convert them to usec */
-        usec = (unsigned long)(elapsed * (tick_nsec / 1000))/LATCH;
-
-        return usec;
-}
-
 #ifdef CONFIG_NO_IDLE_HZ
 static unsigned long initial_match;
 static int match_posponed;
@@ -62,8 +46,6 @@ sa1100_timer_interrupt(int irq, void *dev_id)
 {
         unsigned int next_match;
 
-        write_seqlock(&xtime_lock);
-
 #ifdef CONFIG_NO_IDLE_HZ
         if (match_posponed) {
                 match_posponed = 0;
@@ -85,8 +67,6 @@ sa1100_timer_interrupt(int irq, void *dev_id)
                 next_match = (OSMR0 += LATCH);
         } while ((signed long)(next_match - OSCR) <= 0);
 
-        write_sequnlock(&xtime_lock);
-
         return IRQ_HANDLED;
 }
 
@@ -96,6 +76,20 @@ static struct irqaction sa1100_timer_irq = {
         .handler        = sa1100_timer_interrupt,
 };
 
+static cycle_t sa1100_read_oscr(void)
+{
+        return OSCR;
+}
+
+static struct clocksource cksrc_sa1100_oscr = {
+        .name           = "oscr",
+        .rating         = 200,
+        .read           = sa1100_read_oscr,
+        .mask           = CLOCKSOURCE_MASK(32),
+        .shift          = 20,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
 static void __init sa1100_timer_init(void)
 {
         unsigned long flags;
@@ -109,6 +103,11 @@ static void __init sa1100_timer_init(void)
         OIER = OIER_E0;         /* enable match on timer 0 to cause interrupts */
         OSMR0 = OSCR + LATCH;   /* set initial match */
         local_irq_restore(flags);
+
+        cksrc_sa1100_oscr.mult =
+                clocksource_hz2mult(CLOCK_TICK_RATE, cksrc_sa1100_oscr.shift);
+
+        clocksource_register(&cksrc_sa1100_oscr);
 }
 
 #ifdef CONFIG_NO_IDLE_HZ
@@ -182,7 +181,6 @@ struct sys_timer sa1100_timer = {
         .init           = sa1100_timer_init,
         .suspend        = sa1100_timer_suspend,
         .resume         = sa1100_timer_resume,
-        .offset         = sa1100_gettimeoffset,
 #ifdef CONFIG_NO_IDLE_HZ
         .dyn_tick       = &sa1100_dyn_tick,
 #endif