diff options
| -rw-r--r-- | drivers/tty/serial/mxs-auart.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 55fd362b9879..7081600bede4 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/clk.h> | 32 | #include <linux/clk.h> |
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/pinctrl/consumer.h> | ||
| 35 | 36 | ||
| 36 | #include <asm/cacheflush.h> | 37 | #include <asm/cacheflush.h> |
| 37 | 38 | ||
| @@ -678,6 +679,7 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev) | |||
| 678 | u32 version; | 679 | u32 version; |
| 679 | int ret = 0; | 680 | int ret = 0; |
| 680 | struct resource *r; | 681 | struct resource *r; |
| 682 | struct pinctrl *pinctrl; | ||
| 681 | 683 | ||
| 682 | s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL); | 684 | s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL); |
| 683 | if (!s) { | 685 | if (!s) { |
| @@ -685,6 +687,12 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev) | |||
| 685 | goto out; | 687 | goto out; |
| 686 | } | 688 | } |
| 687 | 689 | ||
| 690 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
| 691 | if (IS_ERR(pinctrl)) { | ||
| 692 | ret = PTR_ERR(pinctrl); | ||
| 693 | goto out_free; | ||
| 694 | } | ||
| 695 | |||
| 688 | s->clk = clk_get(&pdev->dev, NULL); | 696 | s->clk = clk_get(&pdev->dev, NULL); |
| 689 | if (IS_ERR(s->clk)) { | 697 | if (IS_ERR(s->clk)) { |
| 690 | ret = PTR_ERR(s->clk); | 698 | ret = PTR_ERR(s->clk); |
