From 0ad6fcdb874938c0491a682e54df21e161350846 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Tue, 17 Jul 2007 18:10:11 +0900
Subject: [PATCH] --- yaml --- r: 62135 b: refs/heads/master c:
 53aba19f82045c1df838570b8484043e93c4442a h: refs/heads/master i:   62133:
 6b1855b5a4edad006ab2b9260cb547a56fe683bd   62131:
 f905030e53656650f649fcb6d36937f8fc14cc43   62127:
 1e61b91790c4c989b5c65868407510dae5926048 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/sh/configs/se7722_defconfig       |  2 +-
 trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 24 +++++++++++++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 373a568570ea..7296c01e150a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aafae27d0ce73f8507b8983b36006b734aa343a
+refs/heads/master: 53aba19f82045c1df838570b8484043e93c4442a
diff --git a/trunk/arch/sh/configs/se7722_defconfig b/trunk/arch/sh/configs/se7722_defconfig
index 764b813c4051..122b67da73cf 100644
--- a/trunk/arch/sh/configs/se7722_defconfig
+++ b/trunk/arch/sh/configs/se7722_defconfig
@@ -565,7 +565,7 @@ CONFIG_SERIO_LIBPS2=y
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_NR_UARTS=3
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index a3e159ef6dfe..d3d444a900ed 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -19,8 +19,21 @@ static struct plat_sci_port sci_platform_data[] = {
 		.mapbase	= 0xffe00000,
 		.flags		= UPF_BOOT_AUTOCONF,
 		.type		= PORT_SCIF,
-		.irqs		= { 80, 81, 83, 82 },
-	}, {
+		.irqs		= { 80, 80, 80, 80 },
+	},
+	{
+		.mapbase	= 0xffe10000,
+		.flags		= UPF_BOOT_AUTOCONF,
+		.type		= PORT_SCIF,
+		.irqs		= { 81, 81, 81, 81 },
+	},
+	{
+		.mapbase	= 0xffe20000,
+		.flags		= UPF_BOOT_AUTOCONF,
+		.type		= PORT_SCIF,
+		.irqs		= { 82, 82, 82, 82 },
+	},
+	{
 		.flags = 0,
 	}
 };
@@ -48,10 +61,9 @@ static struct ipr_data ipr_irq_table[] = {
 	/* IRQ, IPR-idx, shift, prio */
 	{ 16, 0, 12, 2 }, /* TMU0 */
 	{ 17, 0,  8, 2 }, /* TMU1 */
-	{ 80, 6, 12, 3 }, /* SCIF ERI */
-	{ 81, 6, 12, 3 }, /* SCIF RXI */
-	{ 82, 6, 12, 3 }, /* SCIF BRI */
-	{ 83, 6, 12, 3 }, /* SCIF TXI */
+	{ 80, 6, 12, 3 }, /* SCIF0 */
+	{ 81, 6, 8, 3 },  /* SCIF1 */
+	{ 82, 6, 4, 3 },  /* SCIF2 */
 };
 
 static unsigned long ipr_offsets[] = {