14 files changed, 46 insertions, 246 deletions

diff --git a/arch/m68k/platform/5206/config.c b/arch/m68k/platform/5206/config.c
index 9c335465e66..6fa3f800277 100644
--- a/arch/m68k/platform/5206/config.c
+++ b/arch/m68k/platform/5206/config.c
@@ -98,6 +98,12 @@ void m5206_cpu_reset(void)
 
 void __init config_BSP(char *commandp, int size)
 {
+#if defined(CONFIG_NETtel)
+        /* Copy command line from FLASH to local buffer... */
+        memcpy(commandp, (char *) 0xf0004000, size);
+        commandp[size-1] = 0;
+#endif /* CONFIG_NETtel */
+
         mach_reset = m5206_cpu_reset;
         m5206_timers_init();
         m5206_uarts_init();
diff --git a/arch/m68k/platform/5206e/Makefile b/arch/m68k/platform/5206e/Makefile
deleted file mode 100644
index b5db05625cf..00000000000
--- a/arch/m68k/platform/5206e/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the m68knommu linux kernel.
-#
-
-#
-# If you want to play with the HW breakpoints then you will
-# need to add define this,  which will give you a stack backtrace
-# on the console port whenever a DBG interrupt occurs.  You have to
-# set up you HW breakpoints to trigger a DBG interrupt:
-#
-# ccflags-y := -DTRAP_DBG_INTERRUPT
-# asflags-y := -DTRAP_DBG_INTERRUPT
-#
-
-asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
-
-obj-y := config.o gpio.o
-
diff --git a/arch/m68k/platform/5206e/config.c b/arch/m68k/platform/5206e/config.c
deleted file mode 100644
index 942397984c6..00000000000
--- a/arch/m68k/platform/5206e/config.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************/
-
-/*
- *      linux/arch/m68knommu/platform/5206e/config.c
- *
- *      Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
- */
-
-/***************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <asm/machdep.h>
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#include <asm/mcfuart.h>
-#include <asm/mcfdma.h>
-
-/***************************************************************************/
-
-static struct mcf_platform_uart m5206e_uart_platform[] = {
-        {
-                .mapbase        = MCF_MBAR + MCFUART_BASE1,
-                .irq            = 73,
-        },
-        {
-                .mapbase        = MCF_MBAR + MCFUART_BASE2,
-                .irq            = 74,
-        },
-        { },
-};
-
-static struct platform_device m5206e_uart = {
-        .name                   = "mcfuart",
-        .id                     = 0,
-        .dev.platform_data      = m5206e_uart_platform,
-};
-
-static struct platform_device *m5206e_devices[] __initdata = {
-        &m5206e_uart,
-};
-
-/***************************************************************************/
-
-static void __init m5206e_uart_init_line(int line, int irq)
-{
-        if (line == 0) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
-                writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
-                mcf_mapirq2imr(irq, MCFINTC_UART0);
-        } else if (line == 1) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
-                writeb(irq, MCFUART_BASE2 + MCFUART_UIVR);
-                mcf_mapirq2imr(irq, MCFINTC_UART1);
-        }
-}
-
-static void __init m5206e_uarts_init(void)
-{
-        const int nrlines = ARRAY_SIZE(m5206e_uart_platform);
-        int line;
-
-        for (line = 0; (line < nrlines); line++)
-                m5206e_uart_init_line(line, m5206e_uart_platform[line].irq);
-}
-
-/***************************************************************************/
-
-static void __init m5206e_timers_init(void)
-{
-        /* Timer1 is always used as system timer */
-        writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI3,
-                MCF_MBAR + MCFSIM_TIMER1ICR);
-        mcf_mapirq2imr(MCF_IRQ_TIMER, MCFINTC_TIMER1);
-
-#ifdef CONFIG_HIGHPROFILE
-        /* Timer2 is to be used as a high speed profile timer  */
-        writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3,
-                MCF_MBAR + MCFSIM_TIMER2ICR);
-        mcf_mapirq2imr(MCF_IRQ_PROFILER, MCFINTC_TIMER2);
-#endif
-}
-
-/***************************************************************************/
-
-void m5206e_cpu_reset(void)
-{
-        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)
-        /* Copy command line from FLASH to local buffer... */
-        memcpy(commandp, (char *) 0xf0004000, size);
-        commandp[size-1] = 0;
-#endif /* CONFIG_NETtel */
-
-        mach_reset = m5206e_cpu_reset;
-        m5206e_timers_init();
-        m5206e_uarts_init();
-
-        /* Only support the external interrupts on their primary level */
-        mcf_mapirq2imr(25, MCFINTC_EINT1);
-        mcf_mapirq2imr(28, MCFINTC_EINT4);
-        mcf_mapirq2imr(31, MCFINTC_EINT7);
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
-        platform_add_devices(m5206e_devices, ARRAY_SIZE(m5206e_devices));
-        return 0;
-}
-
-arch_initcall(init_BSP);
-
-/***************************************************************************/
diff --git a/arch/m68k/platform/5206e/gpio.c b/arch/m68k/platform/5206e/gpio.c
deleted file mode 100644
index b9ab4a120f2..00000000000
--- a/arch/m68k/platform/5206e/gpio.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Coldfire generic GPIO support
- *
- * (C) Copyright 2009, Steven King <sfking@fdwdc.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-*/
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#include <asm/mcfgpio.h>
-
-static struct mcf_gpio_chip mcf_gpio_chips[] = {
-        {
-                .gpio_chip                      = {
-                        .label                  = "PP",
-                        .request                = mcf_gpio_request,
-                        .free                   = mcf_gpio_free,
-                        .direction_input        = mcf_gpio_direction_input,
-                        .direction_output       = mcf_gpio_direction_output,
-                        .get                    = mcf_gpio_get_value,
-                        .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
-                },
-                .pddr                           = (void __iomem *) MCFSIM_PADDR,
-                .podr                           = (void __iomem *) MCFSIM_PADAT,
-                .ppdr                           = (void __iomem *) MCFSIM_PADAT,
-        },
-};
-
-static int __init mcf_gpio_init(void)
-{
-        unsigned i = 0;
-        while (i < ARRAY_SIZE(mcf_gpio_chips))
-                (void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);
-        return 0;
-}
-
-core_initcall(mcf_gpio_init);
diff --git a/arch/m68k/platform/5272/intc.c b/arch/m68k/platform/5272/intc.c
index 7e715dfe281..7160e618b0a 100644
--- a/arch/m68k/platform/5272/intc.c
+++ b/arch/m68k/platform/5272/intc.c
@@ -162,8 +162,6 @@ void __init init_IRQ(void)
 {
         int irq, edge;
 
-        init_vectors();
-
         /* Mask all interrupt sources */
         writel(0x88888888, MCF_MBAR + MCFSIM_ICR1);
         writel(0x88888888, MCF_MBAR + MCFSIM_ICR2);
diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S
index f68dce766c0..293e1eba9ac 100644
--- a/arch/m68k/platform/68328/entry.S
+++ b/arch/m68k/platform/68328/entry.S
@@ -236,27 +236,26 @@ ret_from_interrupt:
  * Handler for uninitialized and spurious interrupts.
  */
 ENTRY(bad_interrupt)
-        addql   #1,num_spurious
+        addql   #1,irq_err_count
         rte
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * in a0, next (the new task) is in a1, so don't change these
  * registers until their contents are no longer needed.
  */
 ENTRY(resume)
         movel   %a0,%d1                         /* save prev thread in d1 */
         movew   %sr,%a0@(TASK_THREAD+THREAD_SR) /* save sr */
-        movel   %usp,%a2                        /* save usp */
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack */
+        movel   %usp,%a3                        /* save usp */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP)
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore user stack */
+        movel   %a3,%usp
         movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore user stack */
-        movel   %a0,%usp
         movew   %a1@(TASK_THREAD+THREAD_SR),%sr /* restore thread status reg */
         rts
 
diff --git a/arch/m68k/platform/68328/ints.c b/arch/m68k/platform/68328/ints.c
index a90288cf744..4bd456531f9 100644
--- a/arch/m68k/platform/68328/ints.c
+++ b/arch/m68k/platform/68328/ints.c
@@ -70,9 +70,6 @@ asmlinkage irqreturn_t inthandler7(void);
 
 extern e_vector *_ramvec;
 
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
 /* The 68k family did not have a good way to determine the source
  * of interrupts until later in the family.  The EC000 core does
  * not provide the vector number on the stack, we vector everything
@@ -155,7 +152,7 @@ static struct irq_chip intc_irq_chip = {
  * This function should be called during kernel startup to initialize
  * the machine vector table.
  */
-void __init init_IRQ(void)
+void __init trap_init(void)
 {
         int i;
 
@@ -172,6 +169,11 @@ void __init init_IRQ(void)
         _ramvec[69] = (e_vector) inthandler5;
         _ramvec[70] = (e_vector) inthandler6;
         _ramvec[71] = (e_vector) inthandler7;
+}
+
+void __init init_IRQ(void)
+{
+        int i;
 
         IVR = 0x40; /* Set DragonBall IVR (interrupt base) to 64 */
 
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index a07b14feed9..abbb89672ea 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -157,27 +157,26 @@ ret_from_interrupt:
  * Handler for uninitialized and spurious interrupts.
  */
 bad_interrupt:
-        addql   #1,num_spurious
+        addql   #1,irq_err_count
         rte
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * in a0, next (the new task) is in a1, so don't change these
  * registers until their contents are no longer needed.
  */
 ENTRY(resume)
         movel   %a0,%d1                         /* save prev thread in d1 */
         movew   %sr,%a0@(TASK_THREAD+THREAD_SR) /* save sr */
-        movel   %usp,%a2                        /* save usp */
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack */
+        movel   %usp,%a3                        /* save usp */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP)
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore user stack */
+        movel   %a3,%usp
         movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore user stack */
-        movel   %a0,%usp
         movew   %a1@(TASK_THREAD+THREAD_SR),%sr /* restore thread status reg */
         rts
 
diff --git a/arch/m68k/platform/68360/ints.c b/arch/m68k/platform/68360/ints.c
index 4af0f4e30f7..7b40202d963 100644
--- a/arch/m68k/platform/68360/ints.c
+++ b/arch/m68k/platform/68360/ints.c
@@ -34,9 +34,6 @@ asmlinkage void inthandler(void);
 
 extern void *_ramvec[];
 
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
 static void intc_irq_unmask(struct irq_data *d)
 {
         pquicc->intr_cimr |= (1 << d->irq);
@@ -63,9 +60,8 @@ static struct irq_chip intc_irq_chip = {
  * This function should be called during kernel startup to initialize
  * the vector table.
  */
-void init_IRQ(void)
+void __init trap_init(void)
 {
-        int i;
         int vba = (CPM_VECTOR_BASE<<4);
 
         /* set up the vectors */
@@ -130,6 +126,11 @@ void init_IRQ(void)
 
         /* turn off all CPM interrupts */
         pquicc->intr_cimr = 0x00000000;
+}
+
+void init_IRQ(void)
+{
+        int i;
 
         for (i = 0; (i < NR_IRQS); i++) {
                 irq_set_chip(i, &intc_irq_chip);
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index 27c2b001161..bd27242c2f4 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -182,21 +182,23 @@ ENTRY(inthandler)
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * in a0, next (the new task) is in a1, so don't change these
  * registers until their contents are no longer needed.
- * This is always called in supervisor mode, so don't bother to save
- * and restore sr; user's process sr is actually in the stack.
  */
 ENTRY(resume)
-        movel   %a0, %d1                        /* get prev thread in d1 */
-        RDUSP
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
+        movew   %sr,%d1                          /* save current status */
+        movew   %d1,%a0@(TASK_THREAD+THREAD_SR)
+        movel   %a0,%d1                          /* get prev thread in d1 */
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack pointer */
-        movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
+        RDUSP                                    /* movel %usp,%a3 */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP) /* save thread user stack */
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore thread user stack */
+        WRUSP                                    /* movel %a3,%usp */
+        movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new kernel stack */
+        movew   %a1@(TASK_THREAD+THREAD_SR),%d7  /* restore new status */
+        movew   %d7,%sr
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore thread user stack */
-        WRUSP
         rts
+
diff --git a/arch/m68k/platform/coldfire/intc-2.c b/arch/m68k/platform/coldfire/intc-2.c
index 74b55cfbc3c..995093357c5 100644
--- a/arch/m68k/platform/coldfire/intc-2.c
+++ b/arch/m68k/platform/coldfire/intc-2.c
@@ -194,8 +194,6 @@ void __init init_IRQ(void)
 {
         int irq;
 
-        init_vectors();
-
         /* Mask all interrupt sources */
         __raw_writel(0x1, MCFICM_INTC0 + MCFINTC_IMRL);
 #ifdef MCFICM_INTC1
diff --git a/arch/m68k/platform/coldfire/intc-simr.c b/arch/m68k/platform/coldfire/intc-simr.c
index d6a4d9d53e4..650d52e2927 100644
--- a/arch/m68k/platform/coldfire/intc-simr.c
+++ b/arch/m68k/platform/coldfire/intc-simr.c
@@ -171,8 +171,6 @@ void __init init_IRQ(void)
 {
         int irq, eirq;
 
-        init_vectors();
-
         /* Mask all interrupt sources */
         __raw_writeb(0xff, MCFINTC0_SIMR);
         if (MCFINTC1_SIMR)
diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/platform/coldfire/intc.c
index 0bbb414856e..5c0c150b406 100644
--- a/arch/m68k/platform/coldfire/intc.c
+++ b/arch/m68k/platform/coldfire/intc.c
@@ -139,7 +139,6 @@ void __init init_IRQ(void)
 {
         int irq;
 
-        init_vectors();
         mcf_maskimr(0xffffffff);
 
         for (irq = 0; (irq < NR_IRQS); irq++) {
diff --git a/arch/m68k/platform/coldfire/vectors.c b/arch/m68k/platform/coldfire/vectors.c
index a21d3f870b7..3a7cc524ecd 100644
--- a/arch/m68k/platform/coldfire/vectors.c
+++ b/arch/m68k/platform/coldfire/vectors.c
@@ -35,21 +35,13 @@ asmlinkage void dbginterrupt_c(struct frame *fp)
 
 extern e_vector *_ramvec;
 
-void set_evector(int vecnum, void (*handler)(void))
-{
-        if (vecnum >= 0 && vecnum <= 255)
-                _ramvec[vecnum] = handler;
-}
-
-/***************************************************************************/
-
 /* Assembler routines */
 asmlinkage void buserr(void);
 asmlinkage void trap(void);
 asmlinkage void system_call(void);
 asmlinkage void inthandler(void);
 
-void __init init_vectors(void)
+void __init trap_init(void)
 {
         int i;