Skip to content

Commit

Permalink
m68knommu: merge common ColdFire UART platform setup code
Browse files Browse the repository at this point in the history 
The ColdFire UART is common to all ColdFire CPU's. No need to duplicate
its platform setup code for every CPU family member. Merge all the setup
code into a single shared file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Greg Ungerer committed Mar 4, 2012
1 parent b9a0c3f commit 0d2fe94
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 299 deletions.
34 changes: 0 additions & 34 deletions arch/m68k/platform/5206/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,6 @@

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

static struct mcf_platform_uart m5206_uart_platform[] = {
{
.mapbase = MCFUART_BASE0,
.irq = MCF_IRQ_UART0,
},
{
.mapbase = MCFUART_BASE1,
.irq = MCF_IRQ_UART1,
},
{ },
};

static struct platform_device m5206_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m5206_uart_platform,
};

static struct platform_device *m5206_devices[] __initdata = {
&m5206_uart,
};

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

static void __init m5206_uarts_init(void)
{
/* UART0 interrupt setup */
Expand Down Expand Up @@ -107,13 +83,3 @@ void __init config_BSP(char *commandp, int size)
}

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

static int __init init_BSP(void)
{
platform_add_devices(m5206_devices, ARRAY_SIZE(m5206_devices));
return 0;
}

arch_initcall(init_BSP);

/***************************************************************************/
23 changes: 0 additions & 23 deletions arch/m68k/platform/520x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,6 @@

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

static struct mcf_platform_uart m520x_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 m520x_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m520x_uart_platform,
};

static struct resource m520x_fec_resources[] = {
{
.start = MCFFEC_BASE,
Expand Down Expand Up @@ -218,7 +196,6 @@ static void __init m520x_qspi_init(void)


static struct platform_device *m520x_devices[] __initdata = {
&m520x_uart,
&m520x_fec,
#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
&m520x_qspi,
Expand Down
23 changes: 0 additions & 23 deletions arch/m68k/platform/523x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@

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

static struct mcf_platform_uart m523x_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 m523x_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m523x_uart_platform,
};

static struct resource m523x_fec_resources[] = {
{
.start = MCFFEC_BASE,
Expand Down Expand Up @@ -240,7 +218,6 @@ static void __init m523x_qspi_init(void)
#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */

static struct platform_device *m523x_devices[] __initdata = {
&m523x_uart,
&m523x_fec,
#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
&m523x_qspi,
Expand Down
19 changes: 0 additions & 19 deletions arch/m68k/platform/5249/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,6 @@

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

static struct mcf_platform_uart m5249_uart_platform[] = {
{
.mapbase = MCFUART_BASE0,
.irq = MCF_IRQ_UART0,
},
{
.mapbase = MCFUART_BASE1,
.irq = MCF_IRQ_UART1,
},
{ },
};

static struct platform_device m5249_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m5249_uart_platform,
};

#ifdef CONFIG_M5249C3

static struct resource m5249_smc91x_resources[] = {
Expand Down Expand Up @@ -223,7 +205,6 @@ static void __init m5249_qspi_init(void)


static struct platform_device *m5249_devices[] __initdata = {
&m5249_uart,
#ifdef CONFIG_M5249C3
&m5249_smc91x,
#endif
Expand Down
19 changes: 0 additions & 19 deletions arch/m68k/platform/5272/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,6 @@ unsigned char ledbank = 0xff;

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

static struct mcf_platform_uart m5272_uart_platform[] = {
{
.mapbase = MCFUART_BASE0,
.irq = MCF_IRQ_UART0,
},
{
.mapbase = MCFUART_BASE1,
.irq = MCF_IRQ_UART1,
},
{ },
};

static struct platform_device m5272_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m5272_uart_platform,
};

static struct resource m5272_fec_resources[] = {
{
.start = MCF_MBAR + 0x840,
Expand Down Expand Up @@ -79,7 +61,6 @@ static struct platform_device m5272_fec = {
};

static struct platform_device *m5272_devices[] __initdata = {
&m5272_uart,
&m5272_fec,
};

Expand Down
23 changes: 0 additions & 23 deletions arch/m68k/platform/527x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@

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

static struct mcf_platform_uart m527x_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 m527x_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m527x_uart_platform,
};

static struct resource m527x_fec0_resources[] = {
{
.start = MCFFEC_BASE0,
Expand Down Expand Up @@ -283,7 +261,6 @@ static void __init m527x_qspi_init(void)
#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */

static struct platform_device *m527x_devices[] __initdata = {
&m527x_uart,
&m527x_fec[0],
#ifdef CONFIG_FEC2
&m527x_fec[1],
Expand Down
23 changes: 0 additions & 23 deletions arch/m68k/platform/528x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,6 @@

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

static struct mcf_platform_uart m528x_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 m528x_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m528x_uart_platform,
};

static struct resource m528x_fec_resources[] = {
{
.start = MCFFEC_BASE,
Expand Down Expand Up @@ -209,7 +187,6 @@ static void __init m528x_qspi_init(void)
#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */

static struct platform_device *m528x_devices[] __initdata = {
&m528x_uart,
&m528x_fec,
#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
&m528x_qspi,
Expand Down
34 changes: 0 additions & 34 deletions arch/m68k/platform/5307/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,6 @@ unsigned char ledbank = 0xff;

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

static struct mcf_platform_uart m5307_uart_platform[] = {
{
.mapbase = MCFUART_BASE0,
.irq = MCF_IRQ_UART0,
},
{
.mapbase = MCFUART_BASE1,
.irq = MCF_IRQ_UART1,
},
{ },
};

static struct platform_device m5307_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m5307_uart_platform,
};

static struct platform_device *m5307_devices[] __initdata = {
&m5307_uart,
};

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

static void __init m5307_uarts_init(void)
{
/* UART0 interrupt setup */
Expand Down Expand Up @@ -127,13 +103,3 @@ void __init config_BSP(char *commandp, int size)
}

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

static int __init init_BSP(void)
{
platform_add_devices(m5307_devices, ARRAY_SIZE(m5307_devices));
return 0;
}

arch_initcall(init_BSP);

/***************************************************************************/
23 changes: 0 additions & 23 deletions arch/m68k/platform/532x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,6 @@

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

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,
Expand Down Expand Up @@ -201,7 +179,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,
Expand Down
34 changes: 0 additions & 34 deletions arch/m68k/platform/5407/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,6 @@

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

static struct mcf_platform_uart m5407_uart_platform[] = {
{
.mapbase = MCFUART_BASE0,
.irq = MCF_IRQ_UART0,
},
{
.mapbase = MCFUART_BASE1,
.irq = MCF_IRQ_UART1,
},
{ },
};

static struct platform_device m5407_uart = {
.name = "mcfuart",
.id = 0,
.dev.platform_data = m5407_uart_platform,
};

static struct platform_device *m5407_devices[] __initdata = {
&m5407_uart,
};

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

static void __init m5407_uarts_init(void)
{
/* UART0 interrupt setup */
Expand Down Expand Up @@ -102,13 +78,3 @@ void __init config_BSP(char *commandp, int size)
}

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

static int __init init_BSP(void)
{
platform_add_devices(m5407_devices, ARRAY_SIZE(m5407_devices));
return 0;
}

arch_initcall(init_BSP);

/***************************************************************************/
Loading

0 comments on commit 0d2fe94

Please sign in to comment.