ar7: 2.6.25.1 support
[openwrt.git] / target / linux / ar7 / patches-2.6.25 / 500-serial_kludge.patch
1 Index: linux-2.6.25.1/drivers/serial/8250.c
2 ===================================================================
3 --- linux-2.6.25.1.orig/drivers/serial/8250.c   2008-05-01 23:45:25.000000000 +0200
4 +++ linux-2.6.25.1/drivers/serial/8250.c        2008-05-03 16:25:06.000000000 +0200
5 @@ -267,6 +267,13 @@
6                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
7                 .flags          = UART_CAP_FIFO,
8         },
9 +       [PORT_AR7] = {
10 +               .name           = "TI-AR7",
11 +               .fifo_size      = 16,
12 +               .tx_loadsz      = 16,
13 +               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
14 +               .flags          = UART_CAP_FIFO | UART_CAP_AFE,
15 +       },
16  };
17  
18  #if defined (CONFIG_SERIAL_8250_AU1X00)
19 @@ -2455,7 +2462,11 @@
20  {
21         struct uart_8250_port *up = (struct uart_8250_port *)port;
22  
23 +#ifdef CONFIG_AR7
24 +       wait_for_xmitr(up, BOTH_EMPTY);
25 +#else
26         wait_for_xmitr(up, UART_LSR_THRE);
27 +#endif
28         serial_out(up, UART_TX, ch);
29  }
30  
31 Index: linux-2.6.25.1/include/linux/serial_core.h
32 ===================================================================
33 --- linux-2.6.25.1.orig/include/linux/serial_core.h     2008-05-01 23:45:25.000000000 +0200
34 +++ linux-2.6.25.1/include/linux/serial_core.h  2008-05-03 16:25:06.000000000 +0200
35 @@ -40,7 +40,8 @@
36  #define PORT_NS16550A  14
37  #define PORT_XSCALE    15
38  #define PORT_RM9000    16      /* PMC-Sierra RM9xxx internal UART */
39 -#define PORT_MAX_8250  16      /* max port ID */
40 +#define PORT_AR7       17
41 +#define PORT_MAX_8250  17      /* max port ID */
42  
43  /*
44   * ARM specific type numbers.  These are not currently guaranteed