summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Elwell <phil@raspberrypi.org>2015-05-20 09:29:46 +0100
committerPhil Elwell <phil@raspberrypi.org>2015-05-20 10:28:15 +0100
commit821b3f7b8c9fd331df8adb38777ec8a543d383b6 (patch)
tree340ebd943fd559fdc91b37e7a6b5cad60cd599ef
parente72ad4baf37e44f32adda600b20f443c56130bcf (diff)
downloadlinux-821b3f7b8c9fd331df8adb38777ec8a543d383b6.tar.gz
i2c-bcm2708: When using DT, leave the GPIO setup to pinctrl
-rw-r--r--drivers/i2c/busses/i2c-bcm2708.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
index 81e9374ea120..8773203b34eb 100644
--- a/drivers/i2c/busses/i2c-bcm2708.c
+++ b/drivers/i2c/busses/i2c-bcm2708.c
@@ -382,7 +382,8 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
goto out_clk_put;
}
- bcm2708_i2c_init_pinmode(pdev->id);
+ if (!pdev->dev.of_node)
+ bcm2708_i2c_init_pinmode(pdev->id);
bi = kzalloc(sizeof(*bi), GFP_KERNEL);
if (!bi)