Commit b92225c7 authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: simplify the 520x UART setup code

Simplify the UART setup code so that it no longer loops for each UART
present. Just make it do all the work it needs in a single function.
This will make the code easier to share when we move to a single set
of platform data for ColdFire UARTs.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent a579748d
...@@ -227,41 +227,23 @@ static struct platform_device *m520x_devices[] __initdata = { ...@@ -227,41 +227,23 @@ static struct platform_device *m520x_devices[] __initdata = {
/***************************************************************************/ /***************************************************************************/
static void __init m520x_uart_init_line(int line, int irq) static void __init m520x_uarts_init(void)
{ {
u16 par; u16 par;
u8 par2; u8 par2;
switch (line) { /* UART0 and UART1 GPIO pin setup */
case 0:
par = readw(MCF_GPIO_PAR_UART);
par |= MCF_GPIO_PAR_UART_PAR_UTXD0 |
MCF_GPIO_PAR_UART_PAR_URXD0;
writew(par, MCF_GPIO_PAR_UART);
break;
case 1:
par = readw(MCF_GPIO_PAR_UART); par = readw(MCF_GPIO_PAR_UART);
par |= MCF_GPIO_PAR_UART_PAR_UTXD1 | par |= MCF_GPIO_PAR_UART_PAR_UTXD0 | MCF_GPIO_PAR_UART_PAR_URXD0;
MCF_GPIO_PAR_UART_PAR_URXD1; par |= MCF_GPIO_PAR_UART_PAR_UTXD1 | MCF_GPIO_PAR_UART_PAR_URXD1;
writew(par, MCF_GPIO_PAR_UART); writew(par, MCF_GPIO_PAR_UART);
break;
case 2: /* UART1 GPIO pin setup */
par2 = readb(MCF_GPIO_PAR_FECI2C); par2 = readb(MCF_GPIO_PAR_FECI2C);
par2 &= ~0x0F; par2 &= ~0x0F;
par2 |= MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 | par2 |= MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 |
MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2; MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;
writeb(par2, MCF_GPIO_PAR_FECI2C); writeb(par2, MCF_GPIO_PAR_FECI2C);
break;
}
}
static void __init m520x_uarts_init(void)
{
const int nrlines = ARRAY_SIZE(m520x_uart_platform);
int line;
for (line = 0; (line < nrlines); line++)
m520x_uart_init_line(line, m520x_uart_platform[line].irq);
} }
/***************************************************************************/ /***************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment