From eaf44f85748ebd751a65e2a27a681a76b6bcf412 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 01:02:43 +1000 Subject: [PATCH] --- yaml --- r: 292429 b: refs/heads/master c: 7bdebba492d92837e7f93e9a6ddfb11a498619b7 h: refs/heads/master i: 292427: f33393ebf714349259b69349ee72596bba536228 v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/5307/config.c | 27 +++++++++----------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index b3b65c3c14a1..e143b1a3f3f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cae82a836de23b611054af9d8a6c9aeb1db639e1 +refs/heads/master: 7bdebba492d92837e7f93e9a6ddfb11a498619b7 diff --git a/trunk/arch/m68k/platform/5307/config.c b/trunk/arch/m68k/platform/5307/config.c index dc9ecf07dd07..bad3c27a8a4e 100644 --- a/trunk/arch/m68k/platform/5307/config.c +++ b/trunk/arch/m68k/platform/5307/config.c @@ -53,26 +53,17 @@ static struct platform_device *m5307_devices[] __initdata = { /***************************************************************************/ -static void __init m5307_uart_init_line(int line, int irq) -{ - if (line == 0) { - writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR); - writeb(irq, MCFUART_BASE0 + MCFUART_UIVR); - mcf_mapirq2imr(irq, MCFINTC_UART0); - } else if (line == 1) { - writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR); - writeb(irq, MCFUART_BASE1 + MCFUART_UIVR); - mcf_mapirq2imr(irq, MCFINTC_UART1); - } -} - static void __init m5307_uarts_init(void) { - const int nrlines = ARRAY_SIZE(m5307_uart_platform); - int line; - - for (line = 0; (line < nrlines); line++) - m5307_uart_init_line(line, m5307_uart_platform[line].irq); + /* UART0 interrupt setup */ + writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR); + writeb(MCF_IRQ_UART0, MCFUART_BASE0 + MCFUART_UIVR); + mcf_mapirq2imr(MCF_IRQ_UART0, MCFINTC_UART0); + + /* UART1 interrupt setup */ + writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR); + writeb(MCF_IRQ_UART1, MCFUART_BASE1 + MCFUART_UIVR); + mcf_mapirq2imr(MCF_IRQ_UART1, MCFINTC_UART1); } /***************************************************************************/