[kernel] 2.6.26: fix a typo in the latest mini_fo patch
[openwrt.git] / target / linux / ar7 / patches-2.6.23 / 500-serial_kludge.patch
1 Index: linux-2.6.23.17/drivers/serial/8250.c
2 ===================================================================
3 --- linux-2.6.23.17.orig/drivers/serial/8250.c
4 +++ linux-2.6.23.17/drivers/serial/8250.c
5 @@ -267,6 +267,13 @@ static const struct serial8250_config ua
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 @@ static void serial8250_console_putchar(s
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.23.17/include/linux/serial_core.h
32 ===================================================================
33 --- linux-2.6.23.17.orig/include/linux/serial_core.h
34 +++ linux-2.6.23.17/include/linux/serial_core.h
35 @@ -40,6 +40,7 @@
36 #define PORT_NS16550A 14
37 #define PORT_XSCALE 15
38 #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
39 +#define PORT_AR7 16
40 #define PORT_MAX_8250 16 /* max port ID */
41
42 /*
43 Index: linux-2.6.23.17/include/linux/serialP.h
44 ===================================================================
45 --- linux-2.6.23.17.orig/include/linux/serialP.h
46 +++ linux-2.6.23.17/include/linux/serialP.h
47 @@ -135,6 +135,10 @@ struct rs_multiport_struct {
48 * the interrupt line _up_ instead of down, so if we register the IRQ
49 * while the UART is in that state, we die in an IRQ storm. */
50 #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
51 +#elif defined(CONFIG_AR7)
52 +/* This is how it is set up by bootloader... */
53 +#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
54 + | UART_MCR_RTS | UART_MCR_DTR)
55 #else
56 #define ALPHA_KLUDGE_MCR 0
57 #endif
This page took 0.048435 seconds and 5 git commands to generate.