summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorGanesan Ramalingam <ganesanr@broadcom.com>2012-05-08 18:55:28 +0530
committerWolfram Sang <w.sang@pengutronix.de>2012-05-12 16:49:54 +0200
commita5063f16e2963c5d5b54692fb2da2e327162da78 (patch)
tree3a9ed8fd8c03f0383202b0b7f3b4417e1e8a1040 /drivers/i2c
parentc889e91d2cc22123f20f40dde0c0a91856a20eea (diff)
downloadlinux-3.10-a5063f16e2963c5d5b54692fb2da2e327162da78.tar.gz
linux-3.10-a5063f16e2963c5d5b54692fb2da2e327162da78.tar.bz2
linux-3.10-a5063f16e2963c5d5b54692fb2da2e327162da78.zip
i2c: ocores: register OF i2c devices
Call of_i2c_register_devices() in probe function to register i2c devices specified in the device tree or OF. Signed-off-by: Ganesan Ramalingam <ganesanr@broadcom.com> Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com> [wsa: add proper braces] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-ocores.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 18068dee48f..75194c579b6 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -55,6 +55,7 @@
#include <linux/i2c-ocores.h>
#include <linux/slab.h>
#include <linux/io.h>
+#include <linux/of_i2c.h>
struct ocores_i2c {
void __iomem *base;
@@ -343,6 +344,8 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
if (pdata) {
for (i = 0; i < pdata->num_devices; i++)
i2c_new_device(&i2c->adap, pdata->devices + i);
+ } else {
+ of_i2c_register_devices(&i2c->adap);
}
return 0;