linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 3/9] serial: mxs-auart: adopt pinctrl support
Date: Mon,  7 May 2012 09:16:08 +0800	[thread overview]
Message-ID: <1336353374-28939-4-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1336353374-28939-1-git-send-email-shawn.guo@linaro.org>

Cc: linux-serial at vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 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 55fd362..7081600 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -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);
-- 
1.7.5.4

  parent reply	other threads:[~2012-05-07  1:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07  1:16 [PATCH RESEND 0/9] Enable pinctrl support for mach-mxs Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 1/9] ARM: mxs: enable pinctrl dummy states Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 2/9] serial: amba-pl011: adopt pinctrl support Shawn Guo
2012-05-07  1:16 ` Shawn Guo [this message]
2012-05-07  1:16 ` [PATCH RESEND 4/9] mmc: mxs-mmc: " Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 5/9] mtd: nand: gpmi: " Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 6/9] i2c: mxs: " Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 7/9] ASoC: mxs-saif: " Shawn Guo
2012-05-07 12:04   ` Mark Brown
2012-05-07  1:16 ` [PATCH RESEND 8/9] video: mxsfb: " Shawn Guo
2012-05-07  1:16 ` [PATCH RESEND 9/9] ARM: mxs: enable " Shawn Guo
2012-05-07  7:14 ` [alsa-devel] [PATCH RESEND 0/9] Enable pinctrl support for mach-mxs Dong Aisheng
2012-05-07  7:47   ` Shawn Guo
2012-05-07  8:01     ` Dong Aisheng

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=1336353374-28939-4-git-send-email-shawn.guo@linaro.org \
    --to=shawn.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).