m68knommu: make 527x 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 527x 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/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index 758810ef91ec349f9f2cdf6894e99de1297d5933..7399968b2efee29908f130ee6f2e33a890284165 100644 (file)
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -40,6 +40,10 @@
 #define        MCFINT_QSPI             18              /* Interrupt number for QSPI */
 #define        MCFINT_PIT1             36              /* Interrupt number for PIT1 */
 
+#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.
  */
@@ -72,9 +76,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/527x/config.c b/arch/m68k/platform/527x/config.c
index c948a16beea83386425138e8dc6abc3db860e9e6..56f1ddd3cfdcae2b7245b6120d96dba2d85a65d7 100644 (file)
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -28,16 +28,16 @@
 
 static struct mcf_platform_uart m527x_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,
        },
        { },
 };