diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-06 10:53:35 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-11 21:43:12 -0400 |
commit | 258e055111d3cde2607e0d04eb91da2f7a59b591 (patch) | |
tree | cc66d659a6709111ab2df1b7b41f1de334b1795d /drivers/tty | |
parent | dffa27e7a8626ed2d64f027b0f844fe6fe438c11 (diff) |
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/tty')
-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 @@ | |||
52 | #include <linux/scatterlist.h> | 52 | #include <linux/scatterlist.h> |
53 | #include <linux/delay.h> | 53 | #include <linux/delay.h> |
54 | #include <linux/types.h> | 54 | #include <linux/types.h> |
55 | #include <linux/pinctrl/consumer.h> | ||
55 | 56 | ||
56 | #include <asm/io.h> | 57 | #include <asm/io.h> |
57 | #include <asm/sizes.h> | 58 | #include <asm/sizes.h> |
@@ -1916,6 +1917,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) | |||
1916 | { | 1917 | { |
1917 | struct uart_amba_port *uap; | 1918 | struct uart_amba_port *uap; |
1918 | struct vendor_data *vendor = id->data; | 1919 | struct vendor_data *vendor = id->data; |
1920 | struct pinctrl *pinctrl; | ||
1919 | void __iomem *base; | 1921 | void __iomem *base; |
1920 | int i, ret; | 1922 | int i, ret; |
1921 | 1923 | ||
@@ -1940,6 +1942,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) | |||
1940 | goto free; | 1942 | goto free; |
1941 | } | 1943 | } |
1942 | 1944 | ||
1945 | pinctrl = devm_pinctrl_get_select_default(&dev->dev); | ||
1946 | if (IS_ERR(pinctrl)) { | ||
1947 | ret = PTR_ERR(pinctrl); | ||
1948 | goto unmap; | ||
1949 | } | ||
1950 | |||
1943 | uap->clk = clk_get(&dev->dev, NULL); | 1951 | uap->clk = clk_get(&dev->dev, NULL); |
1944 | if (IS_ERR(uap->clk)) { | 1952 | if (IS_ERR(uap->clk)) { |
1945 | ret = PTR_ERR(uap->clk); | 1953 | ret = PTR_ERR(uap->clk); |