From 39cd251727caee7353c518f9757dbfcf895d2f7a Mon Sep 17 00:00:00 2001
From: Rafael Ignacio Zurita <rizurita@yahoo.com>
Date: Tue, 4 Aug 2009 14:38:08 +0900
Subject: [PATCH] --- yaml --- r: 163379 b: refs/heads/master c:
 05aa7882757f68af799140142ec44f83b2df4298 h: refs/heads/master i:   163377:
 aba02562604da106f18aae194b02d9ec7ad8b6a9   163375:
 d40aeb05a12bba93d6684a28eb937f1d62d72b74 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sh/Kconfig.debug         | 1 +
 trunk/arch/sh/kernel/early_printk.c | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 27639c074309..c3354406f57e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdeb076f20df14b1c7f2817362172548d146b121
+refs/heads/master: 05aa7882757f68af799140142ec44f83b2df4298
diff --git a/trunk/arch/sh/Kconfig.debug b/trunk/arch/sh/Kconfig.debug
index a6dce41296e7..763b792b1611 100644
--- a/trunk/arch/sh/Kconfig.debug
+++ b/trunk/arch/sh/Kconfig.debug
@@ -43,6 +43,7 @@ config EARLY_SCIF_CONSOLE_PORT
 	default "0xfffe8000" if CPU_SUBTYPE_SH7203
 	default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263
 	default "0xffe80000" if CPU_SH4
+	default "0xa4000150" if CPU_SH3
 	default "0x00000000"
 
 config EARLY_PRINTK
diff --git a/trunk/arch/sh/kernel/early_printk.c b/trunk/arch/sh/kernel/early_printk.c
index a952dcf9999d..64f2746baf91 100644
--- a/trunk/arch/sh/kernel/early_printk.c
+++ b/trunk/arch/sh/kernel/early_printk.c
@@ -134,7 +134,7 @@ static void scif_sercon_init(char *s)
 	sci_out(&scif_port, SCFCR, 0x0030);	/* TTRG=b'11 */
 	sci_out(&scif_port, SCSCR, 0x0030);	/* TE, RE */
 }
-#elif defined(CONFIG_CPU_SH4)
+#elif defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
 #define DEFAULT_BAUD 115200
 /*
  * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4
@@ -220,10 +220,8 @@ static int __init setup_early_printk(char *buf)
 		early_console = &scif_console;
 
 #if !defined(CONFIG_SH_STANDARD_BIOS)
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
 		scif_sercon_init(buf + 6);
-#endif
 #endif
 	}
 #endif