From e8e91c04d800e3feb162781418e5aede3f90cbd8 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 01:00:48 +1000 Subject: [PATCH] --- yaml --- r: 292428 b: refs/heads/master c: cae82a836de23b611054af9d8a6c9aeb1db639e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/528x/config.c | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 4308f410b0df..b3b65c3c14a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb1391638633cdeb7dcaacd295bfcbec216ea8f +refs/heads/master: cae82a836de23b611054af9d8a6c9aeb1db639e1 diff --git a/trunk/arch/m68k/platform/528x/config.c b/trunk/arch/m68k/platform/528x/config.c index ca848c9bf619..82af5d883603 100644 --- a/trunk/arch/m68k/platform/528x/config.c +++ b/trunk/arch/m68k/platform/528x/config.c @@ -218,28 +218,14 @@ static struct platform_device *m528x_devices[] __initdata = { /***************************************************************************/ -static void __init m528x_uart_init_line(int line, int irq) +static void __init m528x_uarts_init(void) { u8 port; - if ((line < 0) || (line > 2)) - return; - /* make sure PUAPAR is set for UART0 and UART1 */ - if (line < 2) { - port = readb(MCF5282_GPIO_PUAPAR); - port |= (0x03 << (line * 2)); - writeb(port, MCF5282_GPIO_PUAPAR); - } -} - -static void __init m528x_uarts_init(void) -{ - const int nrlines = ARRAY_SIZE(m528x_uart_platform); - int line; - - for (line = 0; (line < nrlines); line++) - m528x_uart_init_line(line, m528x_uart_platform[line].irq); + port = readb(MCF5282_GPIO_PUAPAR); + port |= 0x03 | (0x03 << 2); + writeb(port, MCF5282_GPIO_PUAPAR); } /***************************************************************************/