1 files changed, 12 insertions, 209 deletions

diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index ca51323f957b..2bec3477b739 100644
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -21,214 +21,33 @@
 #include <linux/param.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/spi/spi.h>
-#include <linux/gpio.h>
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfuart.h>
 #include <asm/mcfdma.h>
 #include <asm/mcfwdebug.h>
-#include <asm/mcfqspi.h>
 
 /***************************************************************************/
 
-static struct mcf_platform_uart m532x_uart_platform[] = {
-        {
-                .mapbase        = MCFUART_BASE1,
-                .irq            = MCFINT_VECBASE + MCFINT_UART0,
-        },
-        {
-                .mapbase        = MCFUART_BASE2,
-                .irq            = MCFINT_VECBASE + MCFINT_UART1,
-        },
-        {
-                .mapbase        = MCFUART_BASE3,
-                .irq            = MCFINT_VECBASE + MCFINT_UART2,
-        },
-        { },
-};
-
-static struct platform_device m532x_uart = {
-        .name                   = "mcfuart",
-        .id                     = 0,
-        .dev.platform_data      = m532x_uart_platform,
-};
-
-static struct resource m532x_fec_resources[] = {
-        {
-                .start          = 0xfc030000,
-                .end            = 0xfc0307ff,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = 64 + 36,
-                .end            = 64 + 36,
-                .flags          = IORESOURCE_IRQ,
-        },
-        {
-                .start          = 64 + 40,
-                .end            = 64 + 40,
-                .flags          = IORESOURCE_IRQ,
-        },
-        {
-                .start          = 64 + 42,
-                .end            = 64 + 42,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device m532x_fec = {
-        .name                   = "fec",
-        .id                     = 0,
-        .num_resources          = ARRAY_SIZE(m532x_fec_resources),
-        .resource               = m532x_fec_resources,
-};
-
-#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
-static struct resource m532x_qspi_resources[] = {
-        {
-                .start          = MCFQSPI_IOBASE,
-                .end            = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = MCFINT_VECBASE + MCFINT_QSPI,
-                .end            = MCFINT_VECBASE + MCFINT_QSPI,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-#define MCFQSPI_CS0    84
-#define MCFQSPI_CS1    85
-#define MCFQSPI_CS2    86
-
-static int m532x_cs_setup(struct mcfqspi_cs_control *cs_control)
-{
-        int status;
-
-        status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");
-        if (status) {
-                pr_debug("gpio_request for MCFQSPI_CS0 failed\n");
-                goto fail0;
-        }
-        status = gpio_direction_output(MCFQSPI_CS0, 1);
-        if (status) {
-                pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");
-                goto fail1;
-        }
-
-        status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");
-        if (status) {
-                pr_debug("gpio_request for MCFQSPI_CS1 failed\n");
-                goto fail1;
-        }
-        status = gpio_direction_output(MCFQSPI_CS1, 1);
-        if (status) {
-                pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");
-                goto fail2;
-        }
-
-        status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");
-        if (status) {
-                pr_debug("gpio_request for MCFQSPI_CS2 failed\n");
-                goto fail2;
-        }
-        status = gpio_direction_output(MCFQSPI_CS2, 1);
-        if (status) {
-                pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");
-                goto fail3;
-        }
-
-        return 0;
-
-fail3:
-        gpio_free(MCFQSPI_CS2);
-fail2:
-        gpio_free(MCFQSPI_CS1);
-fail1:
-        gpio_free(MCFQSPI_CS0);
-fail0:
-        return status;
-}
-
-static void m532x_cs_teardown(struct mcfqspi_cs_control *cs_control)
-{
-        gpio_free(MCFQSPI_CS2);
-        gpio_free(MCFQSPI_CS1);
-        gpio_free(MCFQSPI_CS0);
-}
-
-static void m532x_cs_select(struct mcfqspi_cs_control *cs_control,
-                            u8 chip_select, bool cs_high)
-{
-        gpio_set_value(MCFQSPI_CS0 + chip_select, cs_high);
-}
-
-static void m532x_cs_deselect(struct mcfqspi_cs_control *cs_control,
-                              u8 chip_select, bool cs_high)
-{
-        gpio_set_value(MCFQSPI_CS0 + chip_select, !cs_high);
-}
-
-static struct mcfqspi_cs_control m532x_cs_control = {
-        .setup                  = m532x_cs_setup,
-        .teardown               = m532x_cs_teardown,
-        .select                 = m532x_cs_select,
-        .deselect               = m532x_cs_deselect,
-};
-
-static struct mcfqspi_platform_data m532x_qspi_data = {
-        .bus_num                = 0,
-        .num_chipselect         = 3,
-        .cs_control             = &m532x_cs_control,
-};
-
-static struct platform_device m532x_qspi = {
-        .name                   = "mcfqspi",
-        .id                     = 0,
-        .num_resources          = ARRAY_SIZE(m532x_qspi_resources),
-        .resource               = m532x_qspi_resources,
-        .dev.platform_data      = &m532x_qspi_data,
-};
+#ifdef CONFIG_SPI_COLDFIRE_QSPI
 
 static void __init m532x_qspi_init(void)
 {
         /* setup QSPS pins for QSPI with gpio CS control */
         writew(0x01f0, MCF_GPIO_PAR_QSPI);
 }
-#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */
 
-
-static struct platform_device *m532x_devices[] __initdata = {
-        &m532x_uart,
-        &m532x_fec,
-#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
-        &m532x_qspi,
-#endif
-};
+#endif /* CONFIG_SPI_COLDFIRE_QSPI */
 
 /***************************************************************************/
 
-static void __init m532x_uart_init_line(int line, int irq)
-{
-        if (line == 0) {
-                /* GPIO initialization */
-                MCF_GPIO_PAR_UART |= 0x000F;
-        } else if (line == 1) {
-                /* GPIO initialization */
-                MCF_GPIO_PAR_UART |= 0x0FF0;
-        }
-}
-
 static void __init m532x_uarts_init(void)
 {
-        const int nrlines = ARRAY_SIZE(m532x_uart_platform);
-        int line;
-
-        for (line = 0; (line < nrlines); line++)
-                m532x_uart_init_line(line, m532x_uart_platform[line].irq);
+        /* UART GPIO initialization */
+        MCF_GPIO_PAR_UART |= 0x0FFF;
 }
+
 /***************************************************************************/
 
 static void __init m532x_fec_init(void)
@@ -242,14 +61,6 @@ static void __init m532x_fec_init(void)
 
 /***************************************************************************/
 
-static void m532x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
 #if !defined(CONFIG_BOOTPARAM)
@@ -263,6 +74,13 @@ void __init config_BSP(char *commandp, int size)
         }
 #endif
 
+        mach_sched_init = hw_timer_init;
+        m532x_uarts_init();
+        m532x_fec_init();
+#ifdef CONFIG_SPI_COLDFIRE_QSPI
+        m532x_qspi_init();
+#endif
+
 #ifdef CONFIG_BDM_DISABLE
         /*
          * Disable the BDM clocking.  This also turns off most of the rest of
@@ -274,21 +92,6 @@ void __init config_BSP(char *commandp, int size)
 }
 
 /***************************************************************************/
-
-static int __init init_BSP(void)
-{
-        m532x_uarts_init();
-        m532x_fec_init();
-#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
-        m532x_qspi_init();
-#endif
-        platform_add_devices(m532x_devices, ARRAY_SIZE(m532x_devices));
-        return 0;
-}
-
-arch_initcall(init_BSP);
-
-/***************************************************************************/
 /* Board initialization */
 /***************************************************************************/
 /*