m68knommu: make 5272 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 5272 UART addressing so that:

. UARTs are numbered from 0 up
. base addresses are absolute (not relative to MBAR peripheral register)

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/include/asm/m5272sim.h b/arch/m68k/include/asm/m5272sim.h
index 759c2b07a994938975a8c50aebd04e9d6d850d99..5c71bd4c746d72165a820d90326e6564920f77b8 100644 (file)
--- a/arch/m68k/include/asm/m5272sim.h
+++ b/arch/m68k/include/asm/m5272sim.h
@@ -68,8 +68,8 @@
 #define        MCFSIM_DCMR1            0x5c            /* DRAM 1 Mask reg (r/w) */
 #define        MCFSIM_DCCR1            0x63            /* DRAM 1 Control reg (r/w) */
 
-#define        MCFUART_BASE1           0x100           /* Base address of UART1 */
-#define        MCFUART_BASE2           0x140           /* Base address of UART2 */
+#define        MCFUART_BASE0           (MCF_MBAR + 0x100) /* Base address UART0 */
+#define        MCFUART_BASE1           (MCF_MBAR + 0x140) /* Base address UART1 */
 
 #define        MCFSIM_PACNT            (MCF_MBAR + 0x80) /* Port A Control (r/w) */
 #define        MCFSIM_PADDR            (MCF_MBAR + 0x84) /* Port A Direction (r/w) */
@@ -101,8 +101,8 @@
 #define        MCF_IRQ_TIMER2          70              /* Timer 2 */
 #define        MCF_IRQ_TIMER3          71              /* Timer 3 */
 #define        MCF_IRQ_TIMER4          72              /* Timer 4 */
-#define        MCF_IRQ_UART1           73              /* UART 1 */
-#define        MCF_IRQ_UART2           74              /* UART 2 */
+#define        MCF_IRQ_UART0           73              /* UART 0 */
+#define        MCF_IRQ_UART1           74              /* UART 1 */
 #define        MCF_IRQ_PLIP            75              /* PLIC 2Khz Periodic */
 #define        MCF_IRQ_PLIA            76              /* PLIC Asynchronous */
 #define        MCF_IRQ_USB0            77              /* USB Endpoint 0 */

diff --git a/arch/m68k/platform/5272/config.c b/arch/m68k/platform/5272/config.c
index 426e66c44736440ac29b596b1ae866915a314286..1c99cbae1f978fc7e7ca26f0585ae9d1bd7e7b91 100644 (file)
--- a/arch/m68k/platform/5272/config.c
+++ b/arch/m68k/platform/5272/config.c
@@ -32,12 +32,12 @@ unsigned char ledbank = 0xff;
 
 static struct mcf_platform_uart m5272_uart_platform[] = {
        {
-               .mapbase        = MCF_MBAR + MCFUART_BASE1,
-               .irq            = MCF_IRQ_UART1,
+               .mapbase        = MCFUART_BASE0,
+               .irq            = MCF_IRQ_UART0,
        },
        {
-               .mapbase        = MCF_MBAR + MCFUART_BASE2,
-               .irq            = MCF_IRQ_UART2,
+               .mapbase        = MCFUART_BASE1,
+               .irq            = MCF_IRQ_UART1,
        },
        { },
 };