target/linux/ar7-2.6/patches/500-serial_kludge.patch

   1 diff -Nru linux-2.6.19.2/include/linux/serialP.h linux-ar7/include/linux/serialP.h
   2 --- linux-2.6.19.2/include/linux/serialP.h      2007-01-17 01:24:01.000000000 +0700
   3 +++ linux-ar7/include/linux/serialP.h   2007-03-22 22:36:48.000000000 +0700
   4 @@ -135,6 +135,9 @@
   5   * the interrupt line _up_ instead of down, so if we register the IRQ
   6   * while the UART is in that state, we die in an IRQ storm. */
   7  #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
   8 +#elif defined(CONFIG_AR7)
   9 +/* This is how it is set up by bootloader... */
  10 +#define ALPHA_KLUDGE_MCR  (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR)
  11  #else
  12  #define ALPHA_KLUDGE_MCR 0
  13  #endif
  14 diff -Nru linux-2.6.19.2/include/linux/serial_core.h linux-ar7/include/linux/serial_core.h
  15 --- linux-2.6.19.2/include/linux/serial_core.h  2007-01-11 02:10:37.000000000 +0700
  16 +++ linux-ar7/include/linux/serial_core.h       2007-03-22 22:50:13.000000000 +0700
  17 @@ -39,7 +39,8 @@
  18  #define PORT_RSA       13
  19  #define PORT_NS16550A  14
  20  #define PORT_XSCALE    15
  21 -#define PORT_MAX_8250  15      /* max port ID */
  22 +#define PORT_AR7       16
  23 +#define PORT_MAX_8250  16      /* max port ID */
  24
  25  /*
  26   * ARM specific type numbers.  These are not currently guaranteed
  27 diff -Nru linux-2.6.19.2/drivers/serial/8250.c linux-ar7/drivers/serial/8250.c
  28 --- linux-2.6.19.2/drivers/serial/8250.c        2007-01-11 02:10:37.000000000 +0700
  29 +++ linux-ar7/drivers/serial/8250.c     2007-03-22 22:45:17.000000000 +0700
  30 @@ -251,6 +251,13 @@
  31                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
  32                 .flags          = UART_CAP_FIFO | UART_CAP_UUE,
  33         },
  34 +       [PORT_AR7] = {
  35 +               .name           = "TI-AR7",
  36 +               .fifo_size      = 16,
  37 +               .tx_loadsz      = 16,
  38 +               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
  39 +               .flags          = UART_CAP_FIFO | UART_CAP_AFE,
  40 +       },
  41  };
  42
  43  #ifdef CONFIG_SERIAL_8250_AU1X00
  44 @@ -2243,7 +2250,7 @@
  45  {
  46         struct uart_8250_port *up = (struct uart_8250_port *)port;
  47
  48 -       wait_for_xmitr(up, UART_LSR_THRE);
  49 +       wait_for_xmitr(up, BOTH_EMPTY);
  50         serial_out(up, UART_TX, ch);
  51  }
  52