diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-06 20:21:05 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-11 15:01:57 +0800 |
| commit | fed78ce4c6af1c0d516ae6f4cdc2bb8dbbca8c22 (patch) | |
| tree | ec3ba0c39cb7e5817f9a54005649e47e4a2d2636 | |
| parent | e62d8b8fe73518d1875371a2ee9c5fdd31eba6f8 (diff) | |
| download | linux-3.10-fed78ce4c6af1c0d516ae6f4cdc2bb8dbbca8c22.tar.gz linux-3.10-fed78ce4c6af1c0d516ae6f4cdc2bb8dbbca8c22.tar.bz2 linux-3.10-fed78ce4c6af1c0d516ae6f4cdc2bb8dbbca8c22.zip | |
tty: serial: imx: adopt pinctrl support
Cc: linux-serial@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
| -rw-r--r-- | drivers/tty/serial/imx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index e7feceeebc2..ec206732f68 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -47,6 +47,7 @@ #include <linux/slab.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/pinctrl/consumer.h> #include <asm/io.h> #include <asm/irq.h> @@ -1464,6 +1465,7 @@ static int serial_imx_probe(struct platform_device *pdev) void __iomem *base; int ret = 0; struct resource *res; + struct pinctrl *pinctrl; sport = kzalloc(sizeof(*sport), GFP_KERNEL); if (!sport) @@ -1503,6 +1505,12 @@ static int serial_imx_probe(struct platform_device *pdev) sport->timer.function = imx_timeout; sport->timer.data = (unsigned long)sport; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + ret = PTR_ERR(pinctrl); + goto unmap; + } + sport->clk = clk_get(&pdev->dev, "uart"); if (IS_ERR(sport->clk)) { ret = PTR_ERR(sport->clk); |