From 48f1a597f19ae890ddee1828f4989ec8cb50c632 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 00:56:52 +1000 Subject: [PATCH] --- yaml --- r: 292426 b: refs/heads/master c: 6b656e8a74ca81e04b281a135a49df76ada28a41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/5272/config.c | 27 ++++++++------------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index dc236facd687..bb5cd913b186 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43d94b7f929aa293e8d4845d0b7f754b534d4575 +refs/heads/master: 6b656e8a74ca81e04b281a135a49df76ada28a41 diff --git a/trunk/arch/m68k/platform/5272/config.c b/trunk/arch/m68k/platform/5272/config.c index 1c99cbae1f97..a99a6893a57a 100644 --- a/trunk/arch/m68k/platform/5272/config.c +++ b/trunk/arch/m68k/platform/5272/config.c @@ -85,29 +85,18 @@ static struct platform_device *m5272_devices[] __initdata = { /***************************************************************************/ -static void __init m5272_uart_init_line(int line, int irq) +static void __init m5272_uarts_init(void) { u32 v; - if ((line >= 0) && (line < 2)) { - /* Enable the output lines for the serial ports */ - v = readl(MCF_MBAR + MCFSIM_PBCNT); - v = (v & ~0x000000ff) | 0x00000055; - writel(v, MCF_MBAR + MCFSIM_PBCNT); - - v = readl(MCF_MBAR + MCFSIM_PDCNT); - v = (v & ~0x000003fc) | 0x000002a8; - writel(v, MCF_MBAR + MCFSIM_PDCNT); - } -} - -static void __init m5272_uarts_init(void) -{ - const int nrlines = ARRAY_SIZE(m5272_uart_platform); - int line; + /* Enable the output lines for the serial ports */ + v = readl(MCF_MBAR + MCFSIM_PBCNT); + v = (v & ~0x000000ff) | 0x00000055; + writel(v, MCF_MBAR + MCFSIM_PBCNT); - for (line = 0; (line < nrlines); line++) - m5272_uart_init_line(line, m5272_uart_platform[line].irq); + v = readl(MCF_MBAR + MCFSIM_PDCNT); + v = (v & ~0x000003fc) | 0x000002a8; + writel(v, MCF_MBAR + MCFSIM_PDCNT); } /***************************************************************************/