41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko-linux-2.6/orig/linux-2.6.29-rc3/drivers/serial/samsung.c /opt/Projects/openmoko-linux-2.6/drivers/serial/samsung.c
|
||
|
|
--- a/drivers/serial/samsung.c 2009-01-28 19:49:30.000000000 +0100
|
||
|
|
+++ b/drivers/serial/samsung.c 2009-05-16 13:25:47.000000000 +0200
|
||
|
|
@@ -1208,6 +1355,13 @@
|
||
|
|
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
|
||
|
|
|
||
|
|
static struct uart_port *cons_uart;
|
||
|
|
+static int cons_silenced;
|
||
|
|
+
|
||
|
|
+void s3c24xx_serial_console_set_silence(int silenced)
|
||
|
|
+{
|
||
|
|
+ cons_silenced = silenced;
|
||
|
|
+}
|
||
|
|
+EXPORT_SYMBOL(s3c24xx_serial_console_set_silence);
|
||
|
|
|
||
|
|
static int
|
||
|
|
s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
|
||
|
|
@@ -1232,9 +1386,21 @@
|
||
|
|
s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
|
||
|
|
{
|
||
|
|
unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
|
||
|
|
+ unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
|
||
|
|
+
|
||
|
|
+ if (cons_silenced)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
+ /* If auto HW flow control enabled, temporarily turn it off */
|
||
|
|
+ if (umcon & S3C2410_UMCOM_AFC)
|
||
|
|
+ wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
|
||
|
|
+
|
||
|
|
while (!s3c24xx_serial_console_txrdy(port, ufcon))
|
||
|
|
barrier();
|
||
|
|
wr_regb(cons_uart, S3C2410_UTXH, ch);
|
||
|
|
+
|
||
|
|
+ if (umcon & S3C2410_UMCOM_AFC)
|
||
|
|
+ wr_regl(port, S3C2410_UMCON, umcon);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
|