76d079204d
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
29 lines
733 B
Diff
29 lines
733 B
Diff
--- a/drivers/tty/serial/8250/8250_core.c
|
|
+++ b/drivers/tty/serial/8250/8250_core.c
|
|
@@ -329,6 +329,13 @@ static const struct serial8250_config ua
|
|
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
|
|
.flags = UART_CAP_FIFO | UART_CAP_AFE,
|
|
},
|
|
+ [PORT_AR7] = {
|
|
+ .name = "TI-AR7",
|
|
+ .fifo_size = 16,
|
|
+ .tx_loadsz = 16,
|
|
+ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
|
|
+ .flags = UART_CAP_FIFO | UART_CAP_AFE,
|
|
+ },
|
|
};
|
|
|
|
/* Uart divisor latch read */
|
|
@@ -3174,7 +3181,11 @@ static void serial8250_console_putchar(s
|
|
{
|
|
struct uart_8250_port *up = up_to_u8250p(port);
|
|
|
|
+#ifdef CONFIG_AR7
|
|
+ wait_for_xmitr(up, BOTH_EMPTY);
|
|
+#else
|
|
wait_for_xmitr(up, UART_LSR_THRE);
|
|
+#endif
|
|
serial_port_out(port, UART_TX, ch);
|
|
}
|
|
|