From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 08/14] tty: atmel_serial: add pinctrl support
Date: Tue, 11 Sep 2012 12:33:57 +0200 [thread overview]
Message-ID: <504F1395.8070509@atmel.com> (raw)
In-Reply-To: <1344603731-32667-8-git-send-email-plagnioj@jcrosoft.com>
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD :
> Cc: Linus Walleij <linus.walleij@linaro•org>
> Cc: Nicolas Ferre <nicolas.ferre@atmel•com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
> Cc: linux-serial at vger.kernel.org
> ---
> Hi Greg,
>
> if you don't mind I would like to apply with the rest of the pinctrl
> patch series
>
> Best Regards,
> J.
> drivers/tty/serial/atmel_serial.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 3d7e1ee..65f891b 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)
No: you should branch to "err_alloc_ring:".
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2012-09-11 10:33 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 12:48 [PATCH 00/14] ARM: at91: add pinctrl support Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 13:01 ` [PATCH 01/14] ARM: at91: gpio: implement request and free Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 13:01 ` [PATCH 02/14] at91: regroup gpio and pinctrl under a simple-bus Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 8:52 ` Linus Walleij
2012-08-18 21:14 ` Arnd Bergmann
2012-08-10 13:02 ` [PATCH 03/14] arm: at91: at91sam9x5: fix gpio number per bank Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 8:54 ` Linus Walleij
2012-09-11 10:21 ` Nicolas Ferre
2012-08-18 21:18 ` Arnd Bergmann
2012-08-20 8:02 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 13:02 ` [PATCH 04/14] ARM: at91: add dummies pinctrl for non dt platform Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 8:55 ` Linus Walleij
2012-09-11 10:22 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 05/14] ARM: at91: add pinctrl support Jean-Christophe PLAGNIOL-VILLARD
2012-08-13 14:53 ` Richard Genoud
2012-08-14 2:37 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 7:24 ` Richard Genoud
2012-08-15 14:38 ` Linus Walleij
2012-08-16 12:18 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-16 15:15 ` Warner Losh
2012-08-22 15:34 ` Stephen Warren
2012-08-23 7:06 ` Richard Genoud
2012-08-23 17:49 ` Stephen Warren
2012-08-25 8:38 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 23:46 ` Linus Walleij
2012-08-28 6:51 ` Richard Genoud
2012-09-11 10:27 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 06/14] arm: at91: dt: at91sam9 " Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 8:57 ` Linus Walleij
2012-08-17 15:39 ` Richard Genoud
2012-08-20 14:09 ` Richard Genoud
2012-08-20 15:11 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-20 15:43 ` Richard Genoud
2012-09-11 10:29 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 07/14] arm: at91: dt: at91sam9 add serial " Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:00 ` Linus Walleij
2012-09-11 10:30 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 08/14] tty: atmel_serial: add " Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 16:10 ` Greg KH
2012-08-15 9:01 ` Linus Walleij
2012-09-11 10:33 ` Nicolas Ferre [this message]
2012-08-10 13:02 ` [PATCH 09/14] arm: at91: dt: sam9m10g45ek: use rts/cts pinctrl group for uart1 Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:02 ` Linus Walleij
2012-09-11 10:34 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 10/14] arm: at91: dt: sam9263ek: use rts/cts pinctrl group for uart0 Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:02 ` Linus Walleij
2012-09-11 10:34 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 11/14] arm: at91: dt: sam9g20ek: use rts/cts/dtr/dsr/dcd/ri " Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:03 ` Linus Walleij
2012-09-11 10:36 ` Nicolas Ferre
2012-08-10 13:02 ` [PATCH 12/14] MTD: atmel nand: fix gpio missing request Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:05 ` Linus Walleij
2012-08-10 13:02 ` [PATCH 13/14] arm: at91: dt: at91sam9 add nand pinctrl support Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:06 ` Linus Walleij
2012-08-16 15:19 ` Richard Genoud
2012-08-16 17:38 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-17 6:53 ` Richard Genoud
2012-08-20 7:58 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-10 13:02 ` [PATCH 14/14] MTD: atmel_nand: add pinctrl consumer support Jean-Christophe PLAGNIOL-VILLARD
2012-08-15 9:07 ` Linus Walleij
2012-08-24 11:51 ` Artem Bityutskiy
2012-08-15 8:51 ` [PATCH 01/14] ARM: at91: gpio: implement request and free Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=504F1395.8070509@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox