m68knommu: platform setup for 5307 ColdFire parts

Switch to platform style configuration for 5307 ColdFire parts.
Initial support is for the UARTs. DMA support moved to common code
for all ColdFire parts.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 6040821e637d40af16f2648438aac1ddd3ca632d..5c43d79e42acab578eaf9edc483301074db299d5 100644 (file)
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -13,11 +13,11 @@
 #include <linux/param.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #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/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>

-#include <asm/mcfdma.h>
+#include <asm/mcfuart.h>

 #include <asm/mcfwdebug.h>
 
 /***************************************************************************/
 #include <asm/mcfwdebug.h>
 
 /***************************************************************************/


@@ -38,17 +38,51 @@ unsigned char ledbank = 0xff;
 
 /***************************************************************************/
 
 
 /***************************************************************************/
 

-/*
- *     DMA channel base address table.
- */
-unsigned int   dma_base_addr[MAX_M68K_DMA_CHANNELS] = {
-        MCF_MBAR + MCFDMA_BASE0,
-        MCF_MBAR + MCFDMA_BASE1,
-        MCF_MBAR + MCFDMA_BASE2,
-        MCF_MBAR + MCFDMA_BASE3,
+static struct mcf_platform_uart m5307_uart_platform[] = {
+       {
+               .mapbase        = MCF_MBAR + MCFUART_BASE1,
+               .irq            = 73,
+       },
+       {
+               .mapbase        = MCF_MBAR + MCFUART_BASE2,
+               .irq            = 74,
+       },
+       { },
+};
+
+static struct platform_device m5307_uart = {
+       .name                   = "mcfuart",
+       .id                     = 0,
+       .dev.platform_data      = m5307_uart_platform,

 };
 
 };
 

-unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
+static struct platform_device *m5307_devices[] __initdata = {
+       &m5307_uart,
+};
+
+/***************************************************************************/
+
+static void __init m5307_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_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
+       } else if (line == 1) {
+               writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
+               writeb(irq, MCFUART_BASE2 + MCFUART_UIVR);
+               mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
+       }
+}
+
+static void __init m5307_uarts_init(void)
+{
+       const int nrlines = ARRAY_SIZE(m5307_uart_platform);
+       int line;
+
+       for (line = 0; (line < nrlines); line++)
+               m5307_uart_init_line(line, m5307_uart_platform[line].irq);
+}

 
 /***************************************************************************/
 
 
 /***************************************************************************/
 


@@ -99,7 +133,7 @@ int mcf_timerirqpending(int timer)
 
 /***************************************************************************/
 
 
 /***************************************************************************/
 

-void config_BSP(char *commandp, int size)
+void __init config_BSP(char *commandp, int size)

 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
 
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
 


@@ -117,7 +151,7 @@ void config_BSP(char *commandp, int size)
 
        mach_reset = coldfire_reset;
 
 
        mach_reset = coldfire_reset;
 

-#ifdef MCF_BDM_DISABLE
+#ifdef CONFIG_BDM_DISABLE

        /*
         * Disable the BDM clocking.  This also turns off most of the rest of
         * the BDM device.  This is good for EMC reasons. This option is not
        /*
         * Disable the BDM clocking.  This also turns off most of the rest of
         * the BDM device.  This is good for EMC reasons. This option is not


@@ -128,3 +162,14 @@ void config_BSP(char *commandp, int size)
 }
 
 /***************************************************************************/
 }
 
 /***************************************************************************/

+
+static int __init init_BSP(void)
+{
+       m5307_uarts_init();
+       platform_add_devices(m5307_devices, ARRAY_SIZE(m5307_devices));
+       return 0;
+}
+
+arch_initcall(init_BSP);
+
+/***************************************************************************/