m68knommu: make 520x 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 520x 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/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index eda62de7e607aeb07132a96bbb995caf28a90b49..41ed4dc8d73624e8393b2eee730166171047ee9d 100644 (file)
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -50,6 +50,10 @@
 #define MCFINT_QSPI         31          /* Interrupt number for QSPI */
 #define MCFINT_PIT1         4           /* Interrupt number for PIT1 (PIT0 in processor) */
 
+#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.
  */
@@ -144,9 +148,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 UART2 */
+#define MCFUART_BASE0          0xFC060000      /* Base address of UART0 */
+#define MCFUART_BASE1          0xFC064000      /* Base address of UART1 */
+#define MCFUART_BASE2          0xFC068000      /* Base address of UART2 */
 
 /*
  *  FEC module.

diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
index 61c25151d2211deaa384464a8f4699e1f5ed3cbd..27c7d056dc1f8e55a8f82c7ce7476359f7692ced 100644 (file)
--- a/arch/m68k/platform/520x/config.c
+++ b/arch/m68k/platform/520x/config.c
@@ -27,16 +27,16 @@
 
 static struct mcf_platform_uart m520x_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,
        },
        { },
 };