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/5] can: flexcan: adopt pinctrl support
Date: Mon,  7 May 2012 08:53:58 +0800	[thread overview]
Message-ID: <1336352040-28447-4-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1336352040-28447-1-git-send-email-shawn.guo@linaro.org>

Cc: linux-can at vger.kernel.org
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/net/can/flexcan.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 1efb083..38c0690 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -35,6 +35,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/pinctrl/consumer.h>
 
 #define DRV_NAME			"flexcan"
 
@@ -927,11 +928,16 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
 	struct flexcan_priv *priv;
 	struct resource *mem;
 	struct clk *clk = NULL;
+	struct pinctrl *pinctrl;
 	void __iomem *base;
 	resource_size_t mem_size;
 	int err, irq;
 	u32 clock_freq = 0;
 
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl))
+		return PTR_ERR(pinctrl);
+
 	if (pdev->dev.of_node) {
 		const u32 *clock_freq_p;
 
-- 
1.7.5.4

  parent reply	other threads:[~2012-05-07  0:53 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07  0:53 [PATCH RESEND 0/5] Adopt pinctrl support for a few outstanding imx drivers Shawn Guo
2012-05-07  0:53 ` [PATCH RESEND 1/5] tty: serial: imx: adopt pinctrl support Shawn Guo
2012-05-08  3:43   ` Dong Aisheng
2012-05-07  0:53 ` [PATCH RESEND 2/5] net: fec: " Shawn Guo
2012-05-08  3:44   ` Dong Aisheng
2012-05-11 22:31   ` David Miller
2012-05-07  0:53 ` Shawn Guo [this message]
2012-05-07  8:06   ` [PATCH RESEND 3/5] can: flexcan: " Marc Kleine-Budde
2012-05-07  8:17     ` Shawn Guo
2012-05-07  8:29       ` Marc Kleine-Budde
2012-05-08  3:44   ` Dong Aisheng
2012-07-01 22:49   ` Marc Kleine-Budde
2012-07-02  1:52     ` Shawn Guo
2012-07-03 10:00       ` Marc Kleine-Budde
2012-05-07  0:53 ` [PATCH RESEND 4/5] i2c: imx: " Shawn Guo
2012-05-08  3:45   ` Dong Aisheng
2012-05-07  0:54 ` [PATCH RESEND 5/5] spi/imx: " Shawn Guo
2012-05-08  3:45   ` Dong Aisheng
2012-05-20  4:40     ` Grant Likely
2012-05-20  5:19       ` Shawn Guo
2012-05-07  6:50 ` [PATCH RESEND 0/5] Adopt pinctrl support for a few outstanding imx drivers Dong Aisheng
2012-05-07  7:34   ` Shawn Guo
2012-05-07  7:53     ` 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=1336352040-28447-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).