sh: reset hardware from early printk

Reset the transmitter and receiver when setting up early printk.

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 11b4c85999b73f7746903c50c0fb71b6fa9fbe33..6b7d166694e28fecc3f949b66cb94ae8c2e53950 100644 (file)
--- a/arch/sh/kernel/early_printk.c
+++ b/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) */