From bbbeeaf2f74b634c95af3492e4958e752966eaa5 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sat, 24 Dec 2011 00:46:37 +1000 Subject: m68knommu: make 54xx 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 54xx 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 --- arch/m68k/platform/54xx/config.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'arch/m68k/platform/54xx') diff --git a/arch/m68k/platform/54xx/config.c b/arch/m68k/platform/54xx/config.c index 8282ef1c783e..fdf6dcf5da52 100644 --- a/arch/m68k/platform/54xx/config.c +++ b/arch/m68k/platform/54xx/config.c @@ -29,20 +29,20 @@ static struct mcf_platform_uart m54xx_uart_platform[] = { { - .mapbase = MCF_MBAR + MCFUART_BASE1, - .irq = 64 + 35, + .mapbase = MCFUART_BASE0, + .irq = MCF_IRQ_UART0, }, { - .mapbase = MCF_MBAR + MCFUART_BASE2, - .irq = 64 + 34, + .mapbase = MCFUART_BASE1, + .irq = MCF_IRQ_UART1, }, { - .mapbase = MCF_MBAR + MCFUART_BASE3, - .irq = 64 + 33, + .mapbase = MCFUART_BASE2, + .irq = MCF_IRQ_UART2, }, { - .mapbase = MCF_MBAR + MCFUART_BASE4, - .irq = 64 + 32, + .mapbase = MCFUART_BASE3, + .irq = MCF_IRQ_UART3, }, }; -- cgit v1.2.3