m68knommu: merge old ColdFire interrupt controller masking macros

[karo-tx-linux.git] / arch / m68knommu / platform / 5407 / config.c

diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c
index 1e8ef74ea1566c1409defe471702a9405f8f3418..8aa94837bbc31d819b86d8f608ffa3283ebb4d60 100644 (file)
--- a/arch/m68knommu/platform/5407/config.c
+++ b/arch/m68knommu/platform/5407/config.c
@@ -55,11 +55,11 @@ static void __init m5407_uart_init_line(int line, int irq)
        if (line == 0) {
                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
                writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
-               mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
+               mcf_clrimr(MCFINTC_UART0);
        } else if (line == 1) {
                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
                writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
-               mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
+               mcf_clrimr(MCFINTC_UART1);
        }
 }
 
@@ -81,13 +81,13 @@ void mcf_settimericr(unsigned int timer, unsigned int level)
 
        if (timer <= 2) {
                switch (timer) {
-               case 2:  icr = MCFSIM_TIMER2ICR; imr = MCFSIM_IMR_TIMER2; break;
-               default: icr = MCFSIM_TIMER1ICR; imr = MCFSIM_IMR_TIMER1; break;
+               case 2:  icr = MCFSIM_TIMER2ICR; imr = MCFINTC_TIMER2; break;
+               default: icr = MCFSIM_TIMER1ICR; imr = MCFINTC_TIMER1; break;
                }
 
                icrp = (volatile unsigned char *) (MCF_MBAR + icr);
                *icrp = MCFSIM_ICR_AUTOVEC | (level << 2) | MCFSIM_ICR_PRI3;
-               mcf_setimr(mcf_getimr() & ~imr);
+               mcf_clrimr(imr);
        }
 }
 
@@ -106,8 +106,6 @@ void m5407_cpu_reset(void)
 
 void __init config_BSP(char *commandp, int size)
 {
-       mcf_setimr(MCFSIM_IMR_MASKALL);
-
 #if defined(CONFIG_CLEOPATRA)
        /* Different timer setup - to prevent device clash */
        mcf_timervector = 30;