diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-06 22:53:35 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 09:43:12 +0800 |
| commit | 258e055111d3cde2607e0d04eb91da2f7a59b591 (patch) | |
| tree | cc66d659a6709111ab2df1b7b41f1de334b1795d /drivers | |
| parent | dffa27e7a8626ed2d64f027b0f844fe6fe438c11 (diff) | |
| download | linux-3.10-258e055111d3cde2607e0d04eb91da2f7a59b591.tar.gz linux-3.10-258e055111d3cde2607e0d04eb91da2f7a59b591.tar.bz2 linux-3.10-258e055111d3cde2607e0d04eb91da2f7a59b591.zip | |
serial: amba-pl011: 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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 3d569cd68f5..062ef8c2b3c 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -52,6 +52,7 @@ #include <linux/scatterlist.h> #include <linux/delay.h> #include <linux/types.h> +#include <linux/pinctrl/consumer.h> #include <asm/io.h> #include <asm/sizes.h> @@ -1916,6 +1917,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) { struct uart_amba_port *uap; struct vendor_data *vendor = id->data; + struct pinctrl *pinctrl; void __iomem *base; int i, ret; @@ -1940,6 +1942,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) goto free; } + pinctrl = devm_pinctrl_get_select_default(&dev->dev); + if (IS_ERR(pinctrl)) { + ret = PTR_ERR(pinctrl); + goto unmap; + } + uap->clk = clk_get(&dev->dev, NULL); if (IS_ERR(uap->clk)) { ret = PTR_ERR(uap->clk); |