diff options
| author | Jean-Christophe PLAGNIOL-VILLARD | 2012-07-05 18:41:57 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD | 2012-10-13 03:21:44 +0200 |
| commit | 784557decc48432c389b3d2ec1cbde515a4b2d9f (patch) | |
| tree | 18d83b662db4e47feb7c478a80d1d5618c4eb105 /drivers/tty | |
| parent | arm: at91: dt: at91sam9 add serial pinctrl support (diff) | |
| download | kernel-qcow2-linux-784557decc48432c389b3d2ec1cbde515a4b2d9f.tar.gz kernel-qcow2-linux-784557decc48432c389b3d2ec1cbde515a4b2d9f.tar.xz kernel-qcow2-linux-784557decc48432c389b3d2ec1cbde515a4b2d9f.zip | |
tty: atmel_serial: add pinctrl support
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 3d7e1ee2fa57..65f891be12d1 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -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) |