serial: bfin-sport-uart: Request CTS GPIO PIN when the sport emulated serial device...

This patch is similar to that for bfin-uart hardware flow control.
Sport emulated serial device may be probed earlier before GPIOLIB is initialized.
Requesting and configuring CTS GPIO PIN fails in that early stage.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index ee101c0d358f70f23c480adf251781d42201be89..f6505264ad45c935df6ee2297d1f0331d9676805 100644 (file)
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -299,8 +299,13 @@ static int sport_startup(struct uart_port *port)
                        dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n");
                }
        }
-       if (up->rts_pin >= 0)
-               gpio_direction_output(up->rts_pin, 0);
+       if (up->rts_pin >= 0) {
+               if (gpio_request(up->rts_pin, DRV_NAME)) {
+                       dev_info(port->dev, "fail to request RTS PIN at GPIO_%d\n", up->rts_pin);
+                       up->rts_pin = -1;
+               } else
+                       gpio_direction_output(up->rts_pin, 0);
+       }
 #endif
 
        return 0;
@@ -445,6 +450,8 @@ static void sport_shutdown(struct uart_port *port)
 #ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
        if (up->cts_pin >= 0)
                free_irq(gpio_to_irq(up->cts_pin), up);
+       if (up->rts_pin >= 0)
+               gpio_free(up->rts_pin);
 #endif
 }
 
@@ -811,9 +818,6 @@ static int __devinit sport_uart_probe(struct platform_device *pdev)
                        sport->rts_pin = -1;
                else
                        sport->rts_pin = res->start;
-
-               if (sport->rts_pin >= 0)
-                       gpio_request(sport->rts_pin, DRV_NAME);
 #endif
        }
 
@@ -853,10 +857,6 @@ static int __devexit sport_uart_remove(struct platform_device *pdev)
 
        if (sport) {
                uart_remove_one_port(&sport_uart_reg, &sport->port);
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-               if (sport->rts_pin >= 0)
-                       gpio_free(sport->rts_pin);
-#endif
                iounmap(sport->port.membase);
                peripheral_free_list(
                        (unsigned short *)pdev->dev.platform_data);