summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-16 19:36:21 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-02-22 17:59:12 +0100
commit5c9bdc3f52d20c9bc6c2552c6d3ec5bfa4119f75 (patch)
tree8380af887ca25014b867b8234ca9b6e7037d173a /drivers/tty
parent77a5988355f993840928d195f790a939200a4ff0 (diff)
downloadop-kernel-dev-5c9bdc3f52d20c9bc6c2552c6d3ec5bfa4119f75.zip
op-kernel-dev-5c9bdc3f52d20c9bc6c2552c6d3ec5bfa4119f75.tar.gz
serial/sirf: fixup for changes to pin control
We changed the signature of the pin multiplexing functions to handle any pin business, so fix up the Sirf driver to call this new interface and rename some variables to make the semantics understandable. Cc: linux-serial@vger.kernel.org Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sirfsoc_uart.c20
-rw-r--r--drivers/tty/serial/sirfsoc_uart.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index a60523f..c1a871e 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -22,7 +22,7 @@
#include <linux/io.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
-#include <linux/pinctrl/pinmux.h>
+#include <linux/pinctrl/consumer.h>
#include "sirfsoc_uart.h"
@@ -673,12 +673,12 @@ int sirfsoc_uart_probe(struct platform_device *pdev)
port->irq = res->start;
if (sirfport->hw_flow_ctrl) {
- sirfport->pmx = pinmux_get(&pdev->dev, NULL);
- ret = IS_ERR(sirfport->pmx);
+ sirfport->p = pinctrl_get(&pdev->dev, NULL);
+ ret = IS_ERR(sirfport->p);
if (ret)
- goto pmx_err;
+ goto pin_err;
- pinmux_enable(sirfport->pmx);
+ pinctrl_enable(sirfport->p);
}
port->ops = &sirfsoc_uart_ops;
@@ -696,10 +696,10 @@ int sirfsoc_uart_probe(struct platform_device *pdev)
port_err:
platform_set_drvdata(pdev, NULL);
if (sirfport->hw_flow_ctrl) {
- pinmux_disable(sirfport->pmx);
- pinmux_put(sirfport->pmx);
+ pinctrl_disable(sirfport->p);
+ pinctrl_put(sirfport->p);
}
-pmx_err:
+pin_err:
irq_err:
devm_iounmap(&pdev->dev, port->membase);
err:
@@ -712,8 +712,8 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
struct uart_port *port = &sirfport->port;
platform_set_drvdata(pdev, NULL);
if (sirfport->hw_flow_ctrl) {
- pinmux_disable(sirfport->pmx);
- pinmux_put(sirfport->pmx);
+ pinctrl_disable(sirfport->p);
+ pinctrl_put(sirfport->p);
}
devm_iounmap(&pdev->dev, port->membase);
uart_remove_one_port(&sirfsoc_uart_drv, port);
diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
index fc64260..6e207fd 100644
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -162,7 +162,7 @@ struct sirfsoc_uart_port {
unsigned char ms_enabled;
struct uart_port port;
- struct pinmux *pmx;
+ struct pinctrl *p;
};
/* Hardware Flow Control */
OpenPOWER on IntegriCloud