m68knommu: merge common ColdFire FEC platform setup code
[cascardo/linux.git] / arch / m68k / platform / 532x / config.c
index ac86896..13157ae 100644 (file)
 
 /***************************************************************************/
 
-static struct mcf_platform_uart m532x_uart_platform[] = {
-       {
-               .mapbase        = MCFUART_BASE0,
-               .irq            = MCF_IRQ_UART0,
-       },
-       {
-               .mapbase        = MCFUART_BASE1,
-               .irq            = MCF_IRQ_UART1,
-       },
-       {
-               .mapbase        = MCFUART_BASE2,
-               .irq            = MCF_IRQ_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[] = {
        {
@@ -201,8 +149,6 @@ static void __init m532x_qspi_init(void)
 
 
 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
@@ -210,25 +156,12 @@ static struct platform_device *m532x_devices[] __initdata = {
 
 /***************************************************************************/
 
-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)