Hi,
On Monday 18 March 2013 12:52 PM, Barry Song wrote:
From: Barry Song<[email protected]>
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<[email protected]>
Cc: Linus Walleij<[email protected]>
---
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;
+ }
+
I think, you should also add an "EPROBE_DEFER" check here ?
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
