diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 00:56:52 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-05 09:43:07 +1000 |
| commit | 6b656e8a74ca81e04b281a135a49df76ada28a41 (patch) | |
| tree | 72d4b8b1d895bddfdf8e6d4b81f309a443ead23f | |
| parent | 43d94b7f929aa293e8d4845d0b7f754b534d4575 (diff) | |
| download | blackbird-obmc-linux-6b656e8a74ca81e04b281a135a49df76ada28a41.tar.gz blackbird-obmc-linux-6b656e8a74ca81e04b281a135a49df76ada28a41.zip | |
m68knommu: simplify the 5272 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: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/platform/5272/config.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/m68k/platform/5272/config.c b/arch/m68k/platform/5272/config.c index 1c99cbae1f97..a99a6893a57a 100644 --- a/arch/m68k/platform/5272/config.c +++ b/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); } /***************************************************************************/ |
