diff options
| author | John Crispin <blogic@openwrt.org> | 2014-12-08 06:15:03 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-12-08 06:15:03 +0000 |
| commit | 50dd026b10c4867b0248ea2effbe57af0ef54877 (patch) | |
| tree | def9f2a412218dcb234610df65d367d5b215b1da /target/linux/ar7/patches-3.14/500-serial_kludge.patch | |
| parent | 12dc1f61db82b1588f0a782727f539eb51d04ef8 (diff) | |
| download | upstream-50dd026b10c4867b0248ea2effbe57af0ef54877.tar.gz upstream-50dd026b10c4867b0248ea2effbe57af0ef54877.tar.bz2 upstream-50dd026b10c4867b0248ea2effbe57af0ef54877.zip | |
ar7: bump to 3.14
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43553 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-3.14/500-serial_kludge.patch')
| -rw-r--r-- | target/linux/ar7/patches-3.14/500-serial_kludge.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-3.14/500-serial_kludge.patch b/target/linux/ar7/patches-3.14/500-serial_kludge.patch new file mode 100644 index 0000000000..e686b765ac --- /dev/null +++ b/target/linux/ar7/patches-3.14/500-serial_kludge.patch @@ -0,0 +1,28 @@ +--- a/drivers/tty/serial/8250/8250_core.c ++++ b/drivers/tty/serial/8250/8250_core.c +@@ -323,6 +323,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 */ +@@ -2843,7 +2850,11 @@ static void serial8250_console_putchar(s + struct uart_8250_port *up = + container_of(port, struct uart_8250_port, 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); + } + |