diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 00:41:07 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-05 09:43:06 +1000 |
| commit | 35b7cf22c6b2481f7c425f30898214f73376834d (patch) | |
| tree | b94927551fba59dcfa521f73dd06c39e21bba514 /arch/m68k | |
| parent | f8bb5327a8aae4469563b2e47b6cef1bd2eb3555 (diff) | |
m68knommu: make 532x 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 532x UART addressing so that:
. UARTs are numbered from 0 up
. use a common name for IRQs used
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/m532xsim.h | 10 | ||||
| -rw-r--r-- | arch/m68k/platform/532x/config.c | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h index ba4cc784f574..f963d64c94e3 100644 --- a/arch/m68k/include/asm/m532xsim.h +++ b/arch/m68k/include/asm/m532xsim.h @@ -25,6 +25,10 @@ #define MCFINT_UART2 28 /* Interrupt number for UART2 */ #define MCFINT_QSPI 31 /* Interrupt number for QSPI */ +#define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) +#define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) +#define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) + #define MCF_WTM_WCR MCF_REG16(0xFC098000) /* @@ -82,9 +86,9 @@ /* * UART module. */ -#define MCFUART_BASE1 0xFC060000 /* Base address of UART1 */ -#define MCFUART_BASE2 0xFC064000 /* Base address of UART2 */ -#define MCFUART_BASE3 0xFC068000 /* Base address of UART3 */ +#define MCFUART_BASE0 0xFC060000 /* Base address of UART1 */ +#define MCFUART_BASE1 0xFC064000 /* Base address of UART2 */ +#define MCFUART_BASE2 0xFC068000 /* Base address of UART3 */ /* * Timer module. diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c index 3558a620a00c..ac86896c4fa2 100644 --- a/arch/m68k/platform/532x/config.c +++ b/arch/m68k/platform/532x/config.c @@ -35,16 +35,16 @@ static struct mcf_platform_uart m532x_uart_platform[] = { { - .mapbase = MCFUART_BASE1, - .irq = MCFINT_VECBASE + MCFINT_UART0, + .mapbase = MCFUART_BASE0, + .irq = MCF_IRQ_UART0, }, { - .mapbase = MCFUART_BASE2, - .irq = MCFINT_VECBASE + MCFINT_UART1, + .mapbase = MCFUART_BASE1, + .irq = MCF_IRQ_UART1, }, { - .mapbase = MCFUART_BASE3, - .irq = MCFINT_VECBASE + MCFINT_UART2, + .mapbase = MCFUART_BASE2, + .irq = MCF_IRQ_UART2, }, { }, }; |