diff options
| author | Greg Ungerer | 2011-12-23 15:49:12 +0100 |
|---|---|---|
| committer | Greg Ungerer | 2012-03-05 00:43:06 +0100 |
| commit | a579748dc1b5233e13c7b2fdb0f005f93369bb83 (patch) | |
| tree | 38c0ea2dc2004a565e0e3aad6b0ed6c4676033d5 /arch/m68k | |
| parent | m68knommu: make 54xx UART platform addressing consistent (diff) | |
| download | kernel-qcow2-linux-a579748dc1b5233e13c7b2fdb0f005f93369bb83.tar.gz kernel-qcow2-linux-a579748dc1b5233e13c7b2fdb0f005f93369bb83.tar.xz kernel-qcow2-linux-a579748dc1b5233e13c7b2fdb0f005f93369bb83.zip | |
m68knommu: simplify the 5206 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>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/platform/5206/config.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/arch/m68k/platform/5206/config.c b/arch/m68k/platform/5206/config.c index 4eec699b3bc9..a8ba8106cbc8 100644 --- a/arch/m68k/platform/5206/config.c +++ b/arch/m68k/platform/5206/config.c @@ -44,26 +44,17 @@ static struct platform_device *m5206_devices[] __initdata = { /***************************************************************************/ -static void __init m5206_uart_init_line(int line, int irq) -{ - if (line == 0) { - writel(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) { - writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR); - writeb(irq, MCFUART_BASE1 + MCFUART_UIVR); - mcf_mapirq2imr(irq, MCFINTC_UART1); - } -} - static void __init m5206_uarts_init(void) { - const int nrlines = ARRAY_SIZE(m5206_uart_platform); - int line; - - for (line = 0; (line < nrlines); line++) - m5206_uart_init_line(line, m5206_uart_platform[line].irq); + /* UART0 interrupt setup */ + writel(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 */ + writel(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); } /***************************************************************************/ |