target/linux/s3c24xx/patches-2.6.30/110-serial.patch

   1 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
   2 --- a/drivers/serial/samsung.c  2009-01-28 19:49:30.000000000 +0100
   3 +++ b/drivers/serial/samsung.c  2009-05-16 13:25:47.000000000 +0200
   4 @@ -1208,6 +1355,13 @@
   5  #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
   6
   7  static struct uart_port *cons_uart;
   8 +static int cons_silenced;
   9 +
  10 +void s3c24xx_serial_console_set_silence(int silenced)
  11 +{
  12 +       cons_silenced = silenced;
  13 +}
  14 +EXPORT_SYMBOL(s3c24xx_serial_console_set_silence);
  15
  16  static int
  17  s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
  18 @@ -1232,9 +1386,21 @@
  19  s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
  20  {
  21         unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
  22 +       unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
  23 +
  24 +       if (cons_silenced)
  25 +               return;
  26 +
  27 +       /* If auto HW flow control enabled, temporarily turn it off */
  28 +       if (umcon & S3C2410_UMCOM_AFC)
  29 +               wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
  30 +
  31         while (!s3c24xx_serial_console_txrdy(port, ufcon))
  32                 barrier();
  33         wr_regb(cons_uart, S3C2410_UTXH, ch);
  34 +
  35 +       if (umcon & S3C2410_UMCOM_AFC)
  36 +               wr_regl(port, S3C2410_UMCON, umcon);
  37  }
  38
  39  static void
  40