---

yaml --- r: 96287 b: refs/heads/master c: 191d443 h: refs/heads/master i: 96285: 84ec925 96283: c37ee23 96279: 59c1c82 96271: 95cdc14 96255: 3cbcae6 v: v3
git-mirror · May 8, 2008 · 4e8621c · 4e8621c
1 parent 31023c5
commit 4e8621c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -167,19 +167,19 @@ 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 */
 	sci_out(port, SCBRR, (CONFIG_SH_PCLK_FREQ + 16 * baud) /
 		(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) */