aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/early_printk.c
diff options
context:
space:
mode:
authorMagnus Damm <magnus.damm@gmail.com>2008-04-23 08:16:06 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-05-08 06:51:54 -0400
commit191d4437b9c028afee1a0568d9c7e6e0b264c703 (patch)
tree10e3a01b6a7a0cb35a8ec99d8b6b3cf8021f0bd6 /arch/sh/kernel/early_printk.c
parent4a65e3827bcff072e5f4a96b3f73f9f17eb7d6d8 (diff)
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>
Diffstat (limited to 'arch/sh/kernel/early_printk.c')
-rw-r--r--arch/sh/kernel/early_printk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 11b4c85999b7..6b7d166694e2 100644
--- 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)
167 } while (!(status & SCxSR_TEND(port))); 167 } while (!(status & SCxSR_TEND(port)));
168 168
169 sci_out(port, SCSCR, 0); /* TE=0, RE=0 */ 169 sci_out(port, SCSCR, 0); /* TE=0, RE=0 */
170 sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
170 sci_out(port, SCSMR, 0); 171 sci_out(port, SCSMR, 0);
171 172
172 /* Set baud rate */ 173 /* Set baud rate */
@@ -174,12 +175,11 @@ static void scif_sercon_init(char *s)
174 (32 * baud) - 1); 175 (32 * baud) - 1);
175 udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */ 176 udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
176 177
177 sci_out(port, SCFCR, 12);
178 sci_out(port, SCFCR, 8);
179
180 sci_out(port, SCSPTR, 0); 178 sci_out(port, SCSPTR, 0);
181 sci_out(port, SCxSR, 0x60); 179 sci_out(port, SCxSR, 0x60);
182 sci_out(port, SCLSR, 0); 180 sci_out(port, SCLSR, 0);
181
182 sci_out(port, SCFCR, 0);
183 sci_out(port, SCSCR, 0x30); /* TE=1, RE=1 */ 183 sci_out(port, SCSCR, 0x30); /* TE=1, RE=1 */
184} 184}
185#endif /* defined(CONFIG_CPU_SUBTYPE_SH7720) */ 185#endif /* defined(CONFIG_CPU_SUBTYPE_SH7720) */