Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e174c33 authored by Shawn Guo's avatar Shawn Guo
Browse files

serial: mxs-auart: adopt pinctrl support 



Cc: linux-serial@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 258e0551

drivers/tty/serial/mxs-auart.c

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/pinctrl/consumer.h>



#include <asm/cacheflush.h>
@@ -678,6 +679,7 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev) 
	u32 version;

	int ret = 0;

	struct resource *r;

	struct pinctrl *pinctrl;



	s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);

	if (!s) {
@@ -685,6 +687,12 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev) 
		goto out;

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto out_free;

	}



	s->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(s->clk)) {

		ret = PTR_ERR(s->clk);