From: Barry.Song@csr.com (Barry Song)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] i2c: sirf: get the i2c pin group by pinctrl api
Date: Mon, 18 Mar 2013 15:22:41 +0800 [thread overview]
Message-ID: <1363591361-5992-1-git-send-email-Barry.Song@csr.com> (raw)
From: Barry Song <Baohua.Song@csr.com>
hardcode set i2c pin group to i2c function before, here we
move to use standard pinctrl API to get pins of the group.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
drivers/i2c/busses/i2c-sirf.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index 5a7ad24..dd4004e 100644
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -16,6 +16,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/pinctrl/consumer.h>
#define SIRFSOC_I2C_CLK_CTRL 0x00
#define SIRFSOC_I2C_STATUS 0x0C
@@ -265,6 +266,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
struct i2c_adapter *adap;
struct resource *mem_res;
struct clk *clk;
+ struct pinctrl *pinctrl;
int bitrate;
int ctrl_speed;
int irq;
@@ -272,6 +274,12 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
int err;
u32 regval;
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl)) {
+ err = PTR_ERR(pinctrl);
+ goto failed_pin;
+ }
+
clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {
err = PTR_ERR(clk);
@@ -385,6 +393,7 @@ err_clk_en:
err_clk_prep:
clk_put(clk);
err_get_clk:
+failed_pin:
return err;
}
--
1.7.5.4
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
next reply other threads:[~2013-03-18 7:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 7:22 Barry Song [this message]
2013-03-18 8:01 ` [PATCH] i2c: sirf: get the i2c pin group by pinctrl api Sourav Poddar
2013-03-18 8:23 ` Barry Song
2013-03-18 8:41 ` Sourav Poddar
2013-03-18 8:54 ` Barry Song
2013-03-27 10:20 ` Linus Walleij
2013-03-27 10:36 ` Barry Song
2013-03-27 15:14 ` 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=1363591361-5992-1-git-send-email-Barry.Song@csr.com \
--to=barry.song@csr.com \
--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).