m68knommu: merge old ColdFire interrupt controller masking macros

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

diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 44803bf70a6e0988868f3bd6a8815e1a35e2312c..3e27d2ec03f06d0912fcacd2c23040a352924ebd 100644 (file)
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
@@ -22,8 +21,6 @@
 
 /***************************************************************************/
 
-void coldfire_reset(void);
-
 extern unsigned int mcf_timervector;
 extern unsigned int mcf_profilevector;
 extern unsigned int mcf_timerlevel;
@@ -67,11 +64,11 @@ static void __init m5307_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);
        }
 }
 
@@ -86,20 +83,6 @@ static void __init m5307_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-       volatile unsigned char  *mbar;
-
-       if ((vec >= 25) && (vec <= 31)) {
-               mbar = (volatile unsigned char *) MCF_MBAR;
-               vec = 0x1 << (vec - 24);
-               *(mbar + MCFSIM_AVR) |= vec;
-               mcf_setimr(mcf_getimr() & ~vec);
-       }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
        volatile unsigned char *icrp;
@@ -107,22 +90,31 @@ 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);
        }
 }
 
 /***************************************************************************/
 
-void __init config_BSP(char *commandp, int size)
+void m5307_cpu_reset(void)
 {
-       mcf_setimr(MCFSIM_IMR_MASKALL);
+       local_irq_disable();
+       /* Set watchdog to soft reset, and enabled */
+       __raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);
+       for (;;)
+               /* wait for watchdog to timeout */;
+}
 
+/***************************************************************************/
+
+void __init config_BSP(char *commandp, int size)
+{
 #if defined(CONFIG_NETtel) || \
     defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
        /* Copy command line from FLASH to local buffer... */
@@ -134,7 +126,7 @@ void __init config_BSP(char *commandp, int size)
        mcf_timerlevel = 6;
 #endif
 
-       mach_reset = coldfire_reset;
+       mach_reset = m5307_cpu_reset;
 
 #ifdef CONFIG_BDM_DISABLE
        /*