m68knommu: make 523x 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 523x 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>

diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
index 6235921..919d115 100644 (file)
--- a/arch/m68k/include/asm/m523xsim.h
+++ b/arch/m68k/include/asm/m523xsim.h
@@ -35,9 +35,15 @@
 
 #define        MCFINT_VECBASE          64              /* Vector base number */
 #define        MCFINT_UART0            13              /* Interrupt number for UART0 */
+#define        MCFINT_UART1            14              /* Interrupt number for UART1 */
+#define        MCFINT_UART2            15              /* Interrupt number for UART2 */
 #define        MCFINT_PIT1             36              /* Interrupt number for PIT1 */
 #define MCFINT_QSPI            18              /* 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)
+
 /*
  *     SDRAM configuration registers.
  */
@@ -59,9 +65,9 @@
 /*
  *  UART module.
  */
-#define MCFUART_BASE1          (MCF_IPSBAR + 0x200)
-#define MCFUART_BASE2          (MCF_IPSBAR + 0x240)
-#define MCFUART_BASE3          (MCF_IPSBAR + 0x280)
+#define MCFUART_BASE0          (MCF_IPSBAR + 0x200)
+#define MCFUART_BASE1          (MCF_IPSBAR + 0x240)
+#define MCFUART_BASE2          (MCF_IPSBAR + 0x280)
 
 /*
  *  FEC ethernet module.

diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index aa28392..49502a3 100644 (file)
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -28,16 +28,16 @@
 
 static struct mcf_platform_uart m523x_uart_platform[] = {
        {
-               .mapbase        = MCFUART_BASE1,
-               .irq            = MCFINT_VECBASE + MCFINT_UART0,
+               .mapbase        = MCFUART_BASE0,
+               .irq            = MCF_IRQ_UART0,
        },
        {
-               .mapbase        = MCFUART_BASE2,
-               .irq            = MCFINT_VECBASE + MCFINT_UART0 + 1,
+               .mapbase        = MCFUART_BASE1,
+               .irq            = MCF_IRQ_UART1,
        },
        {
-               .mapbase        = MCFUART_BASE3,
-               .irq            = MCFINT_VECBASE + MCFINT_UART0 + 2,
+               .mapbase        = MCFUART_BASE2,
+               .irq            = MCF_IRQ_UART2,
        },
        { },
 };