summaryrefslogtreecommitdiff
path: root/arch/m68k/platform/5249/config.c
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-12-24 00:28:18 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-03-05 09:43:05 +1000
commite8f69e545e51b9f2870d64082db533557b8d0d09 (patch)
tree00a64e79bbcdcb3dec7451439a6a69d58c61a30c /arch/m68k/platform/5249/config.c
parent13682af34914b553505cce3e417f76b35a0f8d01 (diff)
m68knommu: make 5249 UART platform addressing consistent
If we make all UART addressing consistent across all ColdFire family members then we will be able to remove the duplicated plaform data and use a single setup for all. So modify the ColdFire 5249 UART addressing so that: . UARTs are numbered from 0 up . base addresses are absolute (not relative to MBAR peripheral register) . use a common name for IRQs used Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/5249/config.c')
-rw-r--r--arch/m68k/platform/5249/config.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/5249/config.c
index 50e2d8f23251..b74092a20d2d 100644
--- a/arch/m68k/platform/5249/config.c
+++ b/arch/m68k/platform/5249/config.c
@@ -24,12 +24,12 @@
static struct mcf_platform_uart m5249_uart_platform[] = {
{
- .mapbase = MCF_MBAR + MCFUART_BASE1,
- .irq = 73,
+ .mapbase = MCFUART_BASE0,
+ .irq = MCF_IRQ_UART0,
},
{
- .mapbase = MCF_MBAR + MCFUART_BASE2,
- .irq = 74,
+ .mapbase = MCFUART_BASE1,
+ .irq = MCF_IRQ_UART1,
},
{ },
};
@@ -238,11 +238,11 @@ static void __init m5249_uart_init_line(int line, int irq)
{
if (line == 0) {
writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
- writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
+ 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, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
+ writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
mcf_mapirq2imr(irq, MCFINTC_UART1);
}
}