From: Magnus Damm <magnus.damm@gmail.com>
Date: Wed, 23 Apr 2008 12:05:11 +0000 (+0900)
Subject: sh: drain and wait for early printk
X-Git-Tag: v2.6.26-rc2~14^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a65e3827bcff072e5f4a96b3f73f9f17eb7d6d8;p=linux-2.6

sh: drain and wait for early printk

Drain by waiting for all characters to be sent, and make sure to
wait a little bit after setting up the baud rate.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 18ca249e84..11b4c85999 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -143,6 +143,7 @@ static void scif_sercon_init(char *s)
 {
 	struct uart_port *port = &scif_port;
 	unsigned baud = DEFAULT_BAUD;
+	unsigned int status;
 	char *e;
 
 	if (*s == ',')
@@ -161,12 +162,17 @@ static void scif_sercon_init(char *s)
 			baud = DEFAULT_BAUD;
 	}
 
+	do {
+		status = sci_in(port, SCxSR);
+	} while (!(status & SCxSR_TEND(port)));
+
 	sci_out(port, SCSCR, 0);	 /* TE=0, RE=0 */
 	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);