From 63ca2234d30f96b290f16d67c01f05bed3e29325 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 00:28:18 +1000
Subject: [PATCH] --- yaml --- r: 292415 b: refs/heads/master c:
 e8f69e545e51b9f2870d64082db533557b8d0d09 h: refs/heads/master i:   292413:
 e38984ae45067b28a69d02b73676f41d5be4b9ec   292411:
 645d68327cef79d26e285a656421f7ac75a5b3b7   292407:
 8a864d31b23c492d4b23d94a88273c5469720e66   292399:
 1b06b1964d2c07a055b82de1f070842e81c5babe   292383:
 ccd29c70f5d07b1dd66c836a1ed91ae6a94d39a5   292351:
 f68dd39a2dc4120ee80b5f2280f47d3ad6d69086 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/include/asm/m5249sim.h |  7 +++++--
 trunk/arch/m68k/platform/5249/config.c | 12 ++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1f58c6aed26b..fb50cbc4a281 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13682af34914b553505cce3e417f76b35a0f8d01
+refs/heads/master: e8f69e545e51b9f2870d64082db533557b8d0d09
diff --git a/trunk/arch/m68k/include/asm/m5249sim.h b/trunk/arch/m68k/include/asm/m5249sim.h
index 805714ca8d7d..3e31508619c1 100644
--- a/trunk/arch/m68k/include/asm/m5249sim.h
+++ b/trunk/arch/m68k/include/asm/m5249sim.h
@@ -76,8 +76,8 @@
 /*
  *	UART module.
  */
-#define MCFUART_BASE1		0x1c0           /* Base address of UART1 */
-#define MCFUART_BASE2		0x200           /* Base address of UART2 */
+#define MCFUART_BASE0		(MCF_MBAR + 0x1c0)	/* Base address UART0 */
+#define MCFUART_BASE1		(MCF_MBAR + 0x200)	/* Base address UART1 */
 
 /*
  *	DMA unit base addresses.
@@ -108,6 +108,9 @@
 #define	MCF_IRQ_TIMER		30		/* Timer0, Level 6 */
 #define	MCF_IRQ_PROFILER	31		/* Timer1, Level 7 */
 
+#define	MCF_IRQ_UART0		73		/* UART0 */
+#define	MCF_IRQ_UART1		74		/* UART1 */
+
 /*
  *	General purpose IO registers (in MBAR2).
  */
diff --git a/trunk/arch/m68k/platform/5249/config.c b/trunk/arch/m68k/platform/5249/config.c
index 50e2d8f23251..b74092a20d2d 100644
--- a/trunk/arch/m68k/platform/5249/config.c
+++ b/trunk/arch/m68k/platform/5249/config.c
@@ -24,12 +24,12 @@
 
 static struct mcf_platform_uart m5249_uart_platform[] = {
 	{
-		.mapbase	= MCF_MBAR + MCFUART_BASE1,
-		.irq		= 73,
+		.mapbase	= MCFUART_BASE0,
+		.irq		= MCF_IRQ_UART0,
 	},
 	{
-		.mapbase 	= MCF_MBAR + MCFUART_BASE2,
-		.irq		= 74,
+		.mapbase 	= MCFUART_BASE1,
+		.irq		= MCF_IRQ_UART1,
 	},
 	{ },
 };
@@ -238,11 +238,11 @@ static void __init m5249_uart_init_line(int line, int irq)
 {
 	if (line == 0) {
 		writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
-		writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
+		writeb(irq, MCFUART_BASE0 + MCFUART_UIVR);
 		mcf_mapirq2imr(irq, MCFINTC_UART0);
 	} else if (line == 1) {
 		writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
-		writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
+		writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
 		mcf_mapirq2imr(irq, MCFINTC_UART1);
 	}
 }