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

Commit 784557de authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

tty: atmel_serial: add pinctrl support 



Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent ec6754a7

drivers/tty/serial/atmel_serial.c

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

#include <linux/atmel_serial.h>

#include <linux/uaccess.h>

#include <linux/pinctrl/consumer.h>



#include <asm/io.h>

#include <asm/ioctls.h>
@@ -1773,6 +1774,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) 
	struct atmel_uart_data *pdata = pdev->dev.platform_data;

	void *data;

	int ret = -ENODEV;

	struct pinctrl *pinctrl;



	BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));
@@ -1805,6 +1807,12 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) 


	atmel_init_port(port, pdev);



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto err;

	}



	if (!atmel_use_dma_rx(&port->uart)) {

		ret = -ENOMEM;

		data = kmalloc(sizeof(struct atmel_uart_char)