From 41db8a92abacc6cad3d577f96b17c9b3be23b4bc Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 01:06:06 +1000 Subject: [PATCH] --- yaml --- r: 292431 b: refs/heads/master c: b77fb7faa9c80021e885749f8e4cf84a4981c8ba h: refs/heads/master i: 292429: eaf44f85748ebd751a65e2a27a681a76b6bcf412 292427: f33393ebf714349259b69349ee72596bba536228 292423: b0b445d0c11b6b6024e92771544bf019ac2cceb1 292415: 63ca2234d30f96b290f16d67c01f05bed3e29325 v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/5407/config.c | 27 +++++++++----------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 3ee08e83b716..f306a93e4a7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a75bc61952fdc903a7434acb25b20ec703c23803 +refs/heads/master: b77fb7faa9c80021e885749f8e4cf84a4981c8ba diff --git a/trunk/arch/m68k/platform/5407/config.c b/trunk/arch/m68k/platform/5407/config.c index f8ed5856d7cb..ae2689d246e3 100644 --- a/trunk/arch/m68k/platform/5407/config.c +++ b/trunk/arch/m68k/platform/5407/config.c @@ -44,26 +44,17 @@ static struct platform_device *m5407_devices[] __initdata = { /***************************************************************************/ -static void __init m5407_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 m5407_uarts_init(void) { - const int nrlines = ARRAY_SIZE(m5407_uart_platform); - int line; - - for (line = 0; (line < nrlines); line++) - m5407_uart_init_line(line, m5407_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); } /***************************************************************************/