serial: blackfin: Fix CTS flow control

blackfin uart port drivers mistakenly set the struct uart_port
flags bit UPF_BUG_THRE (which only has meaning to the 8250 core)
while trying to set ASYNC_CTS_FLOW.

Uart port drivers can override termios settings based on actual
hardware support in their .set_termios method; the serial core
sets the appropriate port flags based on the overrides.
Overriding only the initial termios settings is accomplished
by only perform those overrides if the old termios parameter is
NULL.

CC: Sonic Zhang <sonic.zhang@analog.com>
CC: adi-buildroot-devel@lists.sourceforge.net
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index 1174efa466a6f22a9da71dbc78174e25514f7c5b..7810aa290edf7cdc1ff4851cc8afa9792bd1ace2 100644 (file)
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -495,6 +495,13 @@ static void sport_set_termios(struct uart_port *port,
 
        pr_debug("%s enter, c_cflag:%08x\n", __func__, termios->c_cflag);
 
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+       if (old == NULL && up->cts_pin != -1)
+               termios->c_cflag |= CRTSCTS;
+       else if (up->cts_pin == -1)
+               termios->c_cflag &= ~CRTSCTS;
+#endif
+
        switch (termios->c_cflag & CSIZE) {
        case CS8:
                up->csize = 8;
@@ -807,10 +814,8 @@ static int sport_uart_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                if (res == NULL)
                        sport->cts_pin = -1;
-               else {
+               else
                        sport->cts_pin = res->start;
-                       sport->port.flags |= ASYNC_CTS_FLOW;
-               }
 
                res = platform_get_resource(pdev, IORESOURCE_IO, 1);
                if (res == NULL)

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index dddc081568f176b12c397b66008811468fb01fa0..dec0fd725d80e13fc9367bef9ac8a8ec05b179e1 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -785,6 +785,13 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        unsigned int ier, lcr = 0;
        unsigned long timeout;
 
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+       if (old == NULL && uart->cts_pin != -1)
+               termios->c_cflag |= CRTSCTS;
+       else if (uart->cts_pin == -1)
+               termios->c_cflag &= ~CRTSCTS;
+#endif
+
        switch (termios->c_cflag & CSIZE) {
        case CS8:
                lcr = WLS(8);
@@ -1316,12 +1323,8 @@ static int bfin_serial_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                if (res == NULL)
                        uart->cts_pin = -1;
-               else {
+               else
                        uart->cts_pin = res->start;
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-                       uart->port.flags |= ASYNC_CTS_FLOW;
-#endif
-               }
 
                res = platform_get_resource(pdev, IORESOURCE_IO, 1);
                if (res == NULL)