serial: sa1100: add support for mctrl gpios

Add support for the generic mctrl gpio helper.  This will allow us to
convert several board files to use the gpiod tables to assign GPIOs to
serial ports, rather than needing to have private function callbacks.

If the generic mctrl gpio helper fails, ignore the mctrl gpios rather
than preventing the (possibly console) serial port from being created.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 0d31251e04ccbfdec5e59bf586c9bd7b8651ad93..2c86d196fb3ba81c8850254c14896bc6db5adcd4 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -511,6 +511,7 @@ config SERIAL_SA1100
        bool "SA1100 serial port support"
        depends on ARCH_SA1100
        select SERIAL_CORE
+       select SERIAL_MCTRL_GPIO if GPIOLIB
        help
          If you have a machine based on a SA1100/SA1110 StrongARM(R) CPU you
          can enable its onboard serial port by enabling this option.

diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index a399772be3fc5342de88d3d202a05b32758c1d0c..97bdfeccbea9fecfbbb6ebf0fa4f296052de2ebc 100644 (file)
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -28,6 +28,8 @@
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 
+#include "serial_mctrl_gpio.h"
+
 /* We've been assigned a range on the "Low-density serial ports" major */
 #define SERIAL_SA1100_MAJOR    204
 #define MINOR_START            5
@@ -77,6 +79,7 @@ struct sa1100_port {
        struct uart_port        port;
        struct timer_list       timer;
        unsigned int            old_status;
+       struct mctrl_gpios      *gpios;
 };
 
 /*
@@ -174,6 +177,8 @@ static void sa1100_enable_ms(struct uart_port *port)
                container_of(port, struct sa1100_port, port);
 
        mod_timer(&sport->timer, jiffies);
+
+       mctrl_gpio_enable_ms(sport->gpios);
 }
 
 static void
@@ -322,11 +327,21 @@ static unsigned int sa1100_tx_empty(struct uart_port *port)
 
 static unsigned int sa1100_get_mctrl(struct uart_port *port)
 {
-       return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+       struct sa1100_port *sport =
+               container_of(port, struct sa1100_port, port);
+       int ret = TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+
+       mctrl_gpio_get(sport->gpios, &ret);
+
+       return ret;
 }
 
 static void sa1100_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
+       struct sa1100_port *sport =
+               container_of(port, struct sa1100_port, port);
+
+       mctrl_gpio_set(sport->gpios, mctrl);
 }
 
 /*
@@ -842,6 +857,27 @@ static int sa1100_serial_resume(struct platform_device *dev)
        return 0;
 }
 
+static int sa1100_serial_add_one_port(struct sa1100_port *sport, struct platform_device *dev)
+{
+       sport->port.dev = &dev->dev;
+       sport->gpios = mctrl_gpio_init_noauto(sport->port.dev, 0);
+       if (IS_ERR(sport->gpios)) {
+               int err = PTR_ERR(sport->gpios);
+
+               dev_err(sport->port.dev, "failed to get mctrl gpios: %d\n",
+                       err);
+
+               if (err == -EPROBE_DEFER)
+                       return err;
+
+               sport->gpios = NULL;
+       }
+
+       platform_set_drvdata(dev, sport);
+
+       return uart_add_one_port(&sa1100_reg, &sport->port);
+}
+
 static int sa1100_serial_probe(struct platform_device *dev)
 {
        struct resource *res = dev->resource;
@@ -856,9 +892,7 @@ static int sa1100_serial_probe(struct platform_device *dev)
                        if (sa1100_ports[i].port.mapbase != res->start)
                                continue;
 
-                       sa1100_ports[i].port.dev = &dev->dev;
-                       uart_add_one_port(&sa1100_reg, &sa1100_ports[i].port);
-                       platform_set_drvdata(dev, &sa1100_ports[i]);
+                       sa1100_serial_add_one_port(&sa1100_ports[i], dev);
                        break;
                }
        }