From: Greg Ungerer Use __raw_read/__raw_write to write to all registers (instead of using local pointer de-referencing in ColdFirePIT timer code. Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton --- arch/m68knommu/platform/5307/pit.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff -puN arch/m68knommu/platform/5307/pit.c~m68knommu-use-raw-read-write-for-all-register-access-in-coldfire-timer arch/m68knommu/platform/5307/pit.c --- a/arch/m68knommu/platform/5307/pit.c~m68knommu-use-raw-read-write-for-all-register-access-in-coldfire-timer +++ a/arch/m68knommu/platform/5307/pit.c @@ -29,6 +29,7 @@ * By default use timer1 as the system clock timer. */ #define TA(a) (MCF_IPSBAR + MCFPIT_BASE1 + (a)) +#define INTC0 (MCF_IPSBAR + MCFICM_INTC0) /***************************************************************************/ @@ -53,17 +54,14 @@ static struct irqaction coldfire_pit_irq void hw_timer_init(void) { - volatile unsigned char *icrp; - volatile unsigned long *imrp; + u32 imr; setup_irq(MCFINT_VECBASE + MCFINT_PIT1, &coldfire_pit_irq); - icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 + - MCFINTC_ICR0 + MCFINT_PIT1); - *icrp = ICR_INTRCONF; - - imrp = (volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFPIT_IMR); - *imrp &= ~MCFPIT_IMR_IBIT; + __raw_writeb(ICR_INTRCONF, INTC0 + MCFINTC_ICR0 + MCFINT_PIT1); + imr = __raw_readl(INTC0 + MCFPIT_IMR); + imr &= ~MCFPIT_IMR_IBIT; + __raw_writel(imr, INTC0 + MCFPIT_IMR); /* Set up PIT timer 1 as poll clock */ __raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR)); _