m68knommu: clean up ColdFire 532x interrupt setup

With the common intc-simr interrupt controller code in place the ColdFire
532x family startup code can be greatly simplified. Remove all the
interrupt masking code, and the per-device interrupt config here.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c
index 28eb9ea..3d58559 100644 (file)
--- a/arch/m68knommu/platform/532x/config.c
+++ b/arch/m68knommu/platform/532x/config.c
@@ -20,7 +20,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>
@@ -98,18 +97,11 @@ static struct platform_device *m532x_devices[] __initdata = {
 static void __init m532x_uart_init_line(int line, int irq)
 {
        if (line == 0) {
-               MCF_INTC0_ICR26 = 0x3;
-               MCF_INTC0_CIMR = 26;
                /* GPIO initialization */
                MCF_GPIO_PAR_UART |= 0x000F;
        } else if (line == 1) {
-               MCF_INTC0_ICR27 = 0x3;
-               MCF_INTC0_CIMR = 27;
                /* GPIO initialization */
                MCF_GPIO_PAR_UART |= 0x0FF0;
-       } else if (line == 2) {
-               MCF_INTC0_ICR28 = 0x3;
-               MCF_INTC0_CIMR = 28;
        }
 }
 
@@ -125,14 +117,6 @@ static void __init m532x_uarts_init(void)
 
 static void __init m532x_fec_init(void)
 {
-       /* Unmask FEC interrupts at ColdFire interrupt controller */
-       MCF_INTC0_ICR36 = 0x2;
-       MCF_INTC0_ICR40 = 0x2;
-       MCF_INTC0_ICR42 = 0x2;
-
-       MCF_INTC0_IMRH &= ~(MCF_INTC_IMRH_INT_MASK36 |
-               MCF_INTC_IMRH_INT_MASK40 | MCF_INTC_IMRH_INT_MASK42);
-
        /* Set multi-function pins to ethernet mode for fec0 */
        MCF_GPIO_PAR_FECI2C |= (MCF_GPIO_PAR_FECI2C_PAR_MDC_EMDC |
                MCF_GPIO_PAR_FECI2C_PAR_MDIO_EMDIO);
@@ -172,8 +156,6 @@ static void m532x_cpu_reset(void)
 
 void __init config_BSP(char *commandp, int size)
 {
-       mcf_setimr(MCFSIM_IMR_MASKALL);
-
 #if !defined(CONFIG_BOOTPARAM)
        /* Copy command line from FLASH to local buffer... */
        memcpy(commandp, (char *) 0x4000, 4);