diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-29 23:12:20 +0100 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-29 23:41:00 +0100 |
| commit | be11b3b1c71945fbac359104a21d55f245800c7b (patch) | |
| tree | 515a2f1f857b18575f44787dc500735b3602d075 /target/linux/ar7/patches-3.18/500-serial_kludge.patch | |
| parent | 23145d427613ee9b982cec25d187b41cc938f27a (diff) | |
| download | upstream-be11b3b1c71945fbac359104a21d55f245800c7b.tar.gz upstream-be11b3b1c71945fbac359104a21d55f245800c7b.tar.bz2 upstream-be11b3b1c71945fbac359104a21d55f245800c7b.zip | |
ar7: unbreak serial console
Serial output was broken since 3.16 for shared uarts between
kernel and login. Fix this by adding a fix sent upstream.
While at it, drop a useless patch that adds duplicate code.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/ar7/patches-3.18/500-serial_kludge.patch')
| -rw-r--r-- | target/linux/ar7/patches-3.18/500-serial_kludge.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/ar7/patches-3.18/500-serial_kludge.patch b/target/linux/ar7/patches-3.18/500-serial_kludge.patch deleted file mode 100644 index fc725309a8..0000000000 --- a/target/linux/ar7/patches-3.18/500-serial_kludge.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 */ -@@ -3168,7 +3175,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); - } - |