2 files changed, 18 insertions, 14 deletions

diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index 1ed8bfb02772..ae56b8848a9d 100644
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -31,16 +31,20 @@
 /*
  *      UART module.
  */
-#define MCFUART_BASE1           0x8600          /* Base address of UART1 */
-#define MCFUART_BASE2           0x8700          /* Base address of UART2 */
-#define MCFUART_BASE3           0x8800          /* Base address of UART3 */
-#define MCFUART_BASE4           0x8900          /* Base address of UART4 */
+#define MCFUART_BASE0           (MCF_MBAR + 0x8600)     /* Base address UART0 */
+#define MCFUART_BASE1           (MCF_MBAR + 0x8700)     /* Base address UART1 */
+#define MCFUART_BASE2           (MCF_MBAR + 0x8800)     /* Base address UART2 */
+#define MCFUART_BASE3           (MCF_MBAR + 0x8900)     /* Base address UART3 */
 
 /*
  *      Define system peripheral IRQ usage.
  */
-#define MCF_IRQ_TIMER           (64 + 54)       /* Slice Timer 0 */
-#define MCF_IRQ_PROFILER        (64 + 53)       /* Slice Timer 1 */
+#define MCF_IRQ_TIMER           (MCFINT_VECBASE + 54)   /* Slice Timer 0 */
+#define MCF_IRQ_PROFILER        (MCFINT_VECBASE + 53)   /* Slice Timer 1 */
+#define MCF_IRQ_UART0           (MCFINT_VECBASE + 35)
+#define MCF_IRQ_UART1           (MCFINT_VECBASE + 34)
+#define MCF_IRQ_UART2           (MCFINT_VECBASE + 33)
+#define MCF_IRQ_UART3           (MCFINT_VECBASE + 32)
 
 /*
  *      Generic GPIO support
diff --git a/arch/m68k/platform/54xx/config.c b/arch/m68k/platform/54xx/config.c
index 8282ef1c783e..fdf6dcf5da52 100644
--- a/arch/m68k/platform/54xx/config.c
+++ b/arch/m68k/platform/54xx/config.c
@@ -29,20 +29,20 @@
 
 static struct mcf_platform_uart m54xx_uart_platform[] = {
         {
-                .mapbase        = MCF_MBAR + MCFUART_BASE1,
-                .irq            = 64 + 35,
+                .mapbase        = MCFUART_BASE0,
+                .irq            = MCF_IRQ_UART0,
         },
         {
-                .mapbase        = MCF_MBAR + MCFUART_BASE2,
-                .irq            = 64 + 34,
+                .mapbase        = MCFUART_BASE1,
+                .irq            = MCF_IRQ_UART1,
         },
         {
-                .mapbase        = MCF_MBAR + MCFUART_BASE3,
-                .irq            = 64 + 33,
+                .mapbase        = MCFUART_BASE2,
+                .irq            = MCF_IRQ_UART2,
         },
         {
-                .mapbase        = MCF_MBAR + MCFUART_BASE4,
-                .irq            = 64 + 32,
+                .mapbase        = MCFUART_BASE3,
+                .irq            = MCF_IRQ_UART3,
         },
 };