]> Pileus Git - ~andy/linux/commitdiff
serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.
authorSonic Zhang <sonic.zhang@analog.com>
Tue, 13 Dec 2011 04:22:02 +0000 (12:22 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 13 Dec 2011 17:50:15 +0000 (09:50 -0800)
Blackfin uart supports automatic CTS trigger when hardware flow control is enabled.
No need to start and top tx in CTS interrupt. So, remote ASYNC_CTS_FLOW flag.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/tty/serial/bfin_uart.c

index dedd9ab06d82669ed5f2a58a1f7125f115630c7e..26953bfa6922f4ffbebc8da4bb7a2ac60f672695 100644 (file)
@@ -116,11 +116,20 @@ static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
 {
        struct bfin_serial_port *uart = dev_id;
-       unsigned int status;
-
-       status = bfin_serial_get_mctrl(&uart->port);
+       unsigned int status = bfin_serial_get_mctrl(&uart->port);
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
+       struct tty_struct *tty = uart->port.state->port.tty;
+
        UART_CLEAR_SCTS(uart);
+       if (tty->hw_stopped) {
+               if (status) {
+                       tty->hw_stopped = 0;
+                       uart_write_wakeup(&uart->port);
+               }
+       } else {
+               if (!status)
+                       tty->hw_stopped = 1;
+       }
 #endif
        uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
 
@@ -1358,7 +1367,9 @@ static int bfin_serial_probe(struct platform_device *pdev)
                        uart->cts_pin = -1;
                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);