From 4e8621c793a37522998b47f8af2939f7ef566079 Mon Sep 17 00:00:00 2001
From: Magnus Damm <magnus.damm@gmail.com>
Date: Wed, 23 Apr 2008 21:16:06 +0900
Subject: [PATCH] --- yaml --- r: 96287 b: refs/heads/master c:
 191d4437b9c028afee1a0568d9c7e6e0b264c703 h: refs/heads/master i:   96285:
 84ec925a9898b57e9c0d2dd18ce1fa7804a06fd8   96283:
 c37ee23afd78792f390c0fc710ee0f39a5faa8d1   96279:
 59c1c82e96c1438e04705ca005754d23b8d708bc   96271:
 95cdc14dbc16205566743490058e2efd2908a3f9   96255:
 3cbcae632b73198afa813322443f68cd8c533843 v: v3

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

diff --git a/[refs] b/[refs]
index 9b4488d09efe..e30090e799c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a65e3827bcff072e5f4a96b3f73f9f17eb7d6d8
+refs/heads/master: 191d4437b9c028afee1a0568d9c7e6e0b264c703
diff --git a/trunk/arch/sh/kernel/early_printk.c b/trunk/arch/sh/kernel/early_printk.c
index 11b4c85999b7..6b7d166694e2 100644
--- a/trunk/arch/sh/kernel/early_printk.c
+++ b/trunk/arch/sh/kernel/early_printk.c
@@ -167,6 +167,7 @@ static void scif_sercon_init(char *s)
 	} while (!(status & SCxSR_TEND(port)));
 
 	sci_out(port, SCSCR, 0);	 /* TE=0, RE=0 */
+	sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
 	sci_out(port, SCSMR, 0);
 
 	/* Set baud rate */
@@ -174,12 +175,11 @@ static void scif_sercon_init(char *s)
 		(32 * baud) - 1);
 	udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
 
-	sci_out(port, SCFCR, 12);
-	sci_out(port, SCFCR, 8);
-
 	sci_out(port, SCSPTR, 0);
 	sci_out(port, SCxSR, 0x60);
 	sci_out(port, SCLSR, 0);
+
+	sci_out(port, SCFCR, 0);
 	sci_out(port, SCSCR, 0x30);	 /* TE=1, RE=1 */
 }
 #endif /* defined(CONFIG_CPU_SUBTYPE_SH7720) */