Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / m68knommu / platform / 5307 / timers.c

diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index ef49596..24781f0 100644 (file)
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -8,12 +8,12 @@
 
 /***************************************************************************/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/param.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/machdep.h>
@@ -23,6 +23,11 @@
 
 /***************************************************************************/
 
+/*
+ *     By default use timer1 as the system clock timer.
+ */
+#define        TA(a)   (MCF_MBAR + MCFTIMER_BASE1 + (a))
+
 /*
  *     Default the timer and vector to use for ColdFire. Some ColdFire
  *     CPU's and some boards may want different. Their sub-architecture
@@ -32,8 +37,6 @@ unsigned int  mcf_timervector = 29;
 unsigned int   mcf_profilevector = 31;
 unsigned int   mcf_timerlevel = 5;
 
-static volatile struct mcftimer *mcf_timerp;
-
 /*
  *     These provide the underlying interrupt vector support.
  *     Unfortunately it is a little different on each ColdFire.
@@ -46,22 +49,19 @@ extern int mcf_timerirqpending(int timer);
 void coldfire_tick(void)
 {
        /* Reset the ColdFire timer */
-       mcf_timerp->ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF;
+       __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, TA(MCFTIMER_TER));
 }
 
 /***************************************************************************/
 
 void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))
 {
-       /* Set up an internal TIMER as poll clock */
-       mcf_timerp = (volatile struct mcftimer *) (MCF_MBAR + MCFTIMER_BASE1);
-       mcf_timerp->tmr = MCFTIMER_TMR_DISABLE;
-
-       mcf_timerp->trr = (unsigned short) ((MCF_BUSCLK / 16) / HZ);
-       mcf_timerp->tmr = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
-               MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE;
+       __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));
+       __raw_writew(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
+       __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
+               MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));
 
-       request_irq(mcf_timervector, handler, SA_INTERRUPT, "timer", NULL);
+       request_irq(mcf_timervector, handler, IRQF_DISABLED, "timer", NULL);
        mcf_settimericr(1, mcf_timerlevel);
 
 #ifdef CONFIG_HIGHPROFILE
@@ -75,13 +75,8 @@ unsigned long coldfire_timer_offset(void)
 {
        unsigned long trr, tcn, offset;
 
-       /*
-        * The change to pointer and de-reference is to force the compiler
-        * to read the registers with a single 16bit access. Otherwise it
-        * does some crazy 8bit read combining.
-        */
-       tcn = *(&mcf_timerp->tcn);
-       trr = *(&mcf_timerp->trr);
+       tcn = __raw_readw(TA(MCFTIMER_TCN));
+       trr = __raw_readw(TA(MCFTIMER_TRR));
        offset = (tcn * (1000000 / HZ)) / trr;
 
        /* Check if we just wrapped the counters and maybe missed a tick */
@@ -94,22 +89,24 @@ unsigned long coldfire_timer_offset(void)
 #ifdef CONFIG_HIGHPROFILE
 /***************************************************************************/
 
+/*
+ *     By default use timer2 as the profiler clock timer.
+ */
+#define        PA(a)   (MCF_MBAR + MCFTIMER_BASE2 + (a))
+
 /*
  *     Choose a reasonably fast profile timer. Make it an odd value to
  *     try and get good coverage of kernal operations.
  */
 #define        PROFILEHZ       1013
 
-static volatile struct mcftimer *mcf_proftp;
-
 /*
  *     Use the other timer to provide high accuracy profiling info.
  */
-
 void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs)
 {
        /* Reset ColdFire timer2 */
-       mcf_proftp->ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF;
+       __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER));
        if (current->pid)
                profile_tick(CPU_PROFILING, regs);
 }
@@ -121,15 +118,14 @@ void coldfire_profile_init(void)
        printk(KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n", PROFILEHZ);
 
        /* Set up TIMER 2 as high speed profile clock */
-       mcf_proftp = (volatile struct mcftimer *) (MCF_MBAR + MCFTIMER_BASE2);
-       mcf_proftp->tmr = MCFTIMER_TMR_DISABLE;
+       __raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));
 
-       mcf_proftp->trr = (unsigned short) ((MCF_CLK / 16) / PROFILEHZ);
-       mcf_proftp->tmr = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
-               MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE;
+       __raw_writew(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));
+       __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
+               MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));
 
        request_irq(mcf_profilevector, coldfire_profile_tick,
-               (SA_INTERRUPT | IRQ_FLG_FAST), "profile timer", NULL);
+               (IRQF_DISABLED | IRQ_FLG_FAST), "profile timer", NULL);
        mcf_settimericr(2, 7);
 }