From f33393ebf714349259b69349ee72596bba536228 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 00:59:03 +1000 Subject: [PATCH] --- yaml --- r: 292427 b: refs/heads/master c: 1eb1391638633cdeb7dcaacd295bfcbec216ea8f h: refs/heads/master i: 292425: a5d4bb3068eae9cbff6744abc3c750a79a9ead7e 292423: b0b445d0c11b6b6024e92771544bf019ac2cceb1 v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/527x/config.c | 21 ++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index bb5cd913b186..4308f410b0df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b656e8a74ca81e04b281a135a49df76ada28a41 +refs/heads/master: 1eb1391638633cdeb7dcaacd295bfcbec216ea8f diff --git a/trunk/arch/m68k/platform/527x/config.c b/trunk/arch/m68k/platform/527x/config.c index 56f1ddd3cfdc..74dab0248b62 100644 --- a/trunk/arch/m68k/platform/527x/config.c +++ b/trunk/arch/m68k/platform/527x/config.c @@ -295,35 +295,18 @@ static struct platform_device *m527x_devices[] __initdata = { /***************************************************************************/ -static void __init m527x_uart_init_line(int line, int irq) +static void __init m527x_uarts_init(void) { u16 sepmask; - if ((line < 0) || (line > 2)) - return; - /* * External Pin Mask Setting & Enable External Pin for Interface */ sepmask = readw(MCF_IPSBAR + MCF_GPIO_PAR_UART); - if (line == 0) - sepmask |= UART0_ENABLE_MASK; - else if (line == 1) - sepmask |= UART1_ENABLE_MASK; - else if (line == 2) - sepmask |= UART2_ENABLE_MASK; + sepmask |= UART0_ENABLE_MASK | UART1_ENABLE_MASK | UART2_ENABLE_MASK; writew(sepmask, MCF_IPSBAR + MCF_GPIO_PAR_UART); } -static void __init m527x_uarts_init(void) -{ - const int nrlines = ARRAY_SIZE(m527x_uart_platform); - int line; - - for (line = 0; (line < nrlines); line++) - m527x_uart_init_line(line, m527x_uart_platform[line].irq); -} - /***************************************************************************/ static void __init m527x_fec_init(void)