summaryrefslogtreecommitdiff
path: root/drivers/i2c/busses/i2c-cpm.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-08 07:48:18 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 16:14:52 -0600
commit9fd049927ccba1c1d0343239b82f28c4e07fb95d (patch)
treee7d86e42e2643e1376c102f00c0e76d14cf65f86 /drivers/i2c/busses/i2c-cpm.c
parent4f0ddcb020ef8afae65b4edb9aeb4a42ab74f4cf (diff)
of/i2c: Generalize OF support
This patch cleans up the i2c OF support code to make it selectable by all architectures and allow for automatic registration of i2c devices. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/i2c/busses/i2c-cpm.c')
-rw-r--r--drivers/i2c/busses/i2c-cpm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b02b4533651d..03ae62e69596 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -652,6 +652,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
cpm->adap = cpm_ops;
i2c_set_adapdata(&cpm->adap, cpm);
cpm->adap.dev.parent = &ofdev->dev;
+ cpm->adap.dev.of_node = of_node_get(ofdev->dev.of_node);
result = cpm_i2c_setup(cpm);
if (result) {
@@ -679,7 +680,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
/*
* register OF I2C devices
*/
- of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node);
+ of_i2c_register_devices(&cpm->adap);
return 0;
out_shut: