This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-sa1100 / time.c

diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 19b0c0f..1c3d082 100644 (file)
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -84,16 +84,12 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        unsigned int next_match;
 
-       write_seqlock(&xtime_lock);
-
        do {
                timer_tick(regs);
                OSSR = OSSR_M0;  /* Clear match on timer 0 */
                next_match = (OSMR0 += LATCH);
        } while ((signed long)(next_match - OSCR) <= 0);
 
-       write_sequnlock(&xtime_lock);
-
        return IRQ_HANDLED;
 }
 
@@ -103,10 +99,11 @@ static struct irqaction sa1100_timer_irq = {
        .handler        = sa1100_timer_interrupt
 };
 
-static void __init sa1100_timer_init(void)
+void __init sa1100_init_time(void)
 {
        struct timespec tv;
 
+       gettimeoffset = sa1100_gettimeoffset;
        set_rtc = sa1100_set_rtc;
 
        tv.tv_nsec = 0;
@@ -120,40 +117,3 @@ static void __init sa1100_timer_init(void)
        OSCR = 0;               /* initialize free-running timer, force first match */
 }
 
-#ifdef CONFIG_PM
-unsigned long osmr[4], oier;
-
-static void sa1100_timer_suspend(void)
-{
-       osmr[0] = OSMR0;
-       osmr[1] = OSMR1;
-       osmr[2] = OSMR2;
-       osmr[3] = OSMR3;
-       oier = OIER;
-}
-
-static void sa1100_timer_resume(void)
-{
-       OSSR = 0x0f;
-       OSMR0 = osmr[0];
-       OSMR1 = osmr[1];
-       OSMR2 = osmr[2];
-       OSMR3 = osmr[3];
-       OIER = oier;
-
-       /*
-        * OSMR0 is the system timer: make sure OSCR is sufficiently behind
-        */
-       OSCR = OSMR0 - LATCH;
-}
-#else
-#define sa1100_timer_suspend NULL
-#define sa1100_timer_resume NULL
-#endif
-
-struct sys_timer sa1100_timer = {
-       .init           = sa1100_timer_init,
-       .suspend        = sa1100_timer_suspend,
-       .resume         = sa1100_timer_resume,
-       .offset         = sa1100_gettimeoffset,
-};