From: Ryan Bradetich <rbrad@parisc-linux.org>
Date: Fri, 3 Nov 2006 05:52:41 +0000 (+0000)
Subject: [PARISC] [MUX] Mux driver updates
X-Git-Tag: v2.6.21-rc2~35^2~47^2~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3de7b6482b4e9a34f91604ee0fb7a3ace250f3bb;p=karo-tx-linux.git

[PARISC] [MUX] Mux driver updates

This patch changes the Mux console to
use the Mux hardware instead of the PDC
Software console.

Signed-off-by: Ryan Bradetich <rbrad@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index ec57a616788b..6408b9b1561a 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -376,8 +376,17 @@ static void mux_poll(unsigned long unused)
 #ifdef CONFIG_SERIAL_MUX_CONSOLE
 static void mux_console_write(struct console *co, const char *s, unsigned count)
 {
-        while(count--)
-                pdc_iodc_putc(*s++);
+	/* Wait until the FIFO drains. */
+	while(UART_GET_FIFO_CNT(&mux_ports[0].port))
+		udelay(1);
+
+	while(count--) {
+		if(*s == '\n') {
+			UART_PUT_CHAR(&mux_ports[0].port, '\r');
+		}
+		UART_PUT_CHAR(&mux_ports[0].port, *s++);
+	}
+
 }
 
 static int mux_console_setup(struct console *co, char *options)