1 files changed, 92 insertions, 9 deletions

diff --git a/arch/m68knommu/platform/520x/config.c b/arch/m68knommu/platform/520x/config.c
index 6edbd41261cc..06d887cdcbfb 100644
--- a/arch/m68knommu/platform/520x/config.c
+++ b/arch/m68knommu/platform/520x/config.c
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2005,      Freescale (www.freescale.com)
  *  Copyright (C) 2005,      Intec Automation (mike@steroidmicros.com)
- *  Copyright (C) 1999-2003, Greg Ungerer (gerg@snapgear.com)
+ *  Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com)
  *  Copyright (C) 2001-2003, SnapGear Inc. (www.snapgear.com)
  */
 
@@ -13,21 +13,93 @@
 
 #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/dma.h>
+#include <asm/coldfire.h>
+#include <asm/mcfsim.h>
+#include <asm/mcfuart.h>
 
 /***************************************************************************/
 
-/*
- *      DMA channel base address table.
- */
-unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS];
-unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
+void coldfire_reset(void);
 
 /***************************************************************************/
 
-void coldfire_reset(void);
+static struct mcf_platform_uart m520x_uart_platform[] = {
+        {
+                .mapbase        = MCF_MBAR + MCFUART_BASE1,
+                .irq            = MCFINT_VECBASE + MCFINT_UART0,
+        },
+        {
+                .mapbase        = MCF_MBAR + MCFUART_BASE2,
+                .irq            = MCFINT_VECBASE + MCFINT_UART1,
+        },
+        {
+                .mapbase        = MCF_MBAR + MCFUART_BASE3,
+                .irq            = MCFINT_VECBASE + MCFINT_UART2,
+        },
+        { },
+};
+
+static struct platform_device m520x_uart = {
+        .name                   = "mcfuart",
+        .id                     = 0,
+        .dev.platform_data      = m520x_uart_platform,
+};
+
+static struct platform_device *m520x_devices[] __initdata = {
+        &m520x_uart,
+};
+
+/***************************************************************************/
+
+#define INTC0   (MCF_MBAR + MCFICM_INTC0)
+
+static void __init m520x_uart_init_line(int line, int irq)
+{
+        u32 imr;
+        u16 par;
+        u8 par2;
+
+        writeb(0x03, INTC0 + MCFINTC_ICR0 + MCFINT_UART0 + line);
+
+        imr = readl(INTC0 + MCFINTC_IMRL);
+        imr &= ~((1 << (irq - MCFINT_VECBASE)) | 1);
+        writel(imr, INTC0 + MCFINTC_IMRL);
+
+        switch (line) {
+        case 0:
+                par = readw(MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                par |= MCF_GPIO_PAR_UART_PAR_UTXD0 |
+                       MCF_GPIO_PAR_UART_PAR_URXD0;
+                writew(par, MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                break;
+        case 1:
+                par = readw(MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                par |= MCF_GPIO_PAR_UART_PAR_UTXD1 |
+                       MCF_GPIO_PAR_UART_PAR_URXD1;
+                writew(par, MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                break;
+        case 2:
+                par2 = readb(MCF_IPSBAR + MCF_GPIO_PAR_FECI2C);
+                par2 &= ~0x0F;
+                par2 |= MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 |
+                        MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;
+                writeb(par2, MCF_IPSBAR + MCF_GPIO_PAR_FECI2C);
+                break;
+        }
+}
+
+static void __init m520x_uarts_init(void)
+{
+        const int nrlines = ARRAY_SIZE(m520x_uart_platform);
+        int line;
+
+        for (line = 0; (line < nrlines); line++)
+                m520x_uart_init_line(line, m520x_uart_platform[line].irq);
+}
 
 /***************************************************************************/
 
@@ -42,9 +114,20 @@ void mcf_autovector(unsigned int vec)
 
 /***************************************************************************/
 
-void config_BSP(char *commandp, int size)
+void __init config_BSP(char *commandp, int size)
 {
         mach_reset = coldfire_reset;
+        m520x_uarts_init();
 }
 
 /***************************************************************************/
+
+static int __init init_BSP(void)
+{
+        platform_add_devices(m520x_devices, ARRAY_SIZE(m520x_devices));
+        return 0;
+}
+
+arch_initcall(init_BSP);
+
+/***************************************************************************/