From 3add50fb53e872eede91bcc477c0f9a7ee33d003 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 00:41:07 +1000
Subject: [PATCH] --- yaml --- r: 292420 b: refs/heads/master c:
 35b7cf22c6b2481f7c425f30898214f73376834d h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/include/asm/m532xsim.h | 10 +++++++---
 trunk/arch/m68k/platform/532x/config.c | 12 ++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 58adbe69bc44..ba623b91e4a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8bb5327a8aae4469563b2e47b6cef1bd2eb3555
+refs/heads/master: 35b7cf22c6b2481f7c425f30898214f73376834d
diff --git a/trunk/arch/m68k/include/asm/m532xsim.h b/trunk/arch/m68k/include/asm/m532xsim.h
index ba4cc784f574..f963d64c94e3 100644
--- a/trunk/arch/m68k/include/asm/m532xsim.h
+++ b/trunk/arch/m68k/include/asm/m532xsim.h
@@ -25,6 +25,10 @@
 #define MCFINT_UART2        28          /* Interrupt number for UART2 */
 #define MCFINT_QSPI         31          /* 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)
+
 #define MCF_WTM_WCR	MCF_REG16(0xFC098000)
 
 /*
@@ -82,9 +86,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 UART3 */
+#define MCFUART_BASE0		0xFC060000	/* Base address of UART1 */
+#define MCFUART_BASE1		0xFC064000	/* Base address of UART2 */
+#define MCFUART_BASE2		0xFC068000	/* Base address of UART3 */
 
 /*
  *  Timer module.
diff --git a/trunk/arch/m68k/platform/532x/config.c b/trunk/arch/m68k/platform/532x/config.c
index 3558a620a00c..ac86896c4fa2 100644
--- a/trunk/arch/m68k/platform/532x/config.c
+++ b/trunk/arch/m68k/platform/532x/config.c
@@ -35,16 +35,16 @@
 
 static struct mcf_platform_uart m532x_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,
 	},
 	{ },
 };