1 files changed, 63 insertions, 9 deletions

diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index 634a6375e4a5..2a3cf5ea1336 100644
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -13,11 +13,11 @@
 #include <linux/param.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/dma.h>
+#include <linux/io.h>
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
-#include <asm/mcfdma.h>
+#include <asm/mcfuart.h>
 
 /***************************************************************************/
 
@@ -37,14 +37,57 @@ unsigned char ledbank = 0xff;
 
 /***************************************************************************/
 
-/*
- *      DMA channel base address table.
- */
-unsigned int   dma_base_addr[MAX_M68K_DMA_CHANNELS] = {
-        MCF_MBAR + MCFDMA_BASE0,
+static struct mcf_platform_uart m5272_uart_platform[] = {
+        {
+                .mapbase        = MCF_MBAR + MCFUART_BASE1,
+                .irq            = 73,
+        },
+        {
+                .mapbase        = MCF_MBAR + MCFUART_BASE2,
+                .irq            = 74,
+        },
+        { },
 };
 
-unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
+static struct platform_device m5272_uart = {
+        .name                   = "mcfuart",
+        .id                     = 0,
+        .dev.platform_data      = m5272_uart_platform,
+};
+
+static struct platform_device *m5272_devices[] __initdata = {
+        &m5272_uart,
+};
+
+/***************************************************************************/
+
+static void __init m5272_uart_init_line(int line, int irq)
+{
+        u32 v;
+
+        if ((line >= 0) && (line < 2)) {
+                v = (line) ? 0x0e000000 : 0xe0000000;
+                writel(v, MCF_MBAR + MCFSIM_ICR2);
+
+                /* Enable the output lines for the serial ports */
+                v = readl(MCF_MBAR + MCFSIM_PBCNT);
+                v = (v & ~0x000000ff) | 0x00000055;
+                writel(v, MCF_MBAR + MCFSIM_PBCNT);
+
+                v = readl(MCF_MBAR + MCFSIM_PDCNT);
+                v = (v & ~0x000003fc) | 0x000002a8;
+                writel(v, MCF_MBAR + MCFSIM_PDCNT);
+        }
+}
+
+static void __init m5272_uarts_init(void)
+{
+        const int nrlines = ARRAY_SIZE(m5272_uart_platform);
+        int line;
+
+        for (line = 0; (line < nrlines); line++)
+                m5272_uart_init_line(line, m5272_uart_platform[line].irq);
+}
 
 /***************************************************************************/
 
@@ -93,7 +136,7 @@ int mcf_timerirqpending(int timer)
 
 /***************************************************************************/
 
-void config_BSP(char *commandp, int size)
+void __init config_BSP(char *commandp, int size)
 {
 #if defined (CONFIG_MOD5272)
         volatile unsigned char  *pivrp;
@@ -125,3 +168,14 @@ void config_BSP(char *commandp, int size)
 }
 
 /***************************************************************************/
+
+static int __init init_BSP(void)
+{
+        m5272_uarts_init();
+        platform_add_devices(m5272_devices, ARRAY_SIZE(m5272_devices));
+        return 0;
+}
+
+arch_initcall(init_BSP);
+
+/***************************************************************************/