diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 09:48:18 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 18:14:52 -0400 |
commit | 9fd049927ccba1c1d0343239b82f28c4e07fb95d (patch) | |
tree | e7d86e42e2643e1376c102f00c0e76d14cf65f86 /drivers/i2c/busses/i2c-cpm.c | |
parent | 4f0ddcb020ef8afae65b4edb9aeb4a42ab74f4cf (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.c | 3 |
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, | |||
652 | cpm->adap = cpm_ops; | 652 | cpm->adap = cpm_ops; |
653 | i2c_set_adapdata(&cpm->adap, cpm); | 653 | i2c_set_adapdata(&cpm->adap, cpm); |
654 | cpm->adap.dev.parent = &ofdev->dev; | 654 | cpm->adap.dev.parent = &ofdev->dev; |
655 | cpm->adap.dev.of_node = of_node_get(ofdev->dev.of_node); | ||
655 | 656 | ||
656 | result = cpm_i2c_setup(cpm); | 657 | result = cpm_i2c_setup(cpm); |
657 | if (result) { | 658 | if (result) { |
@@ -679,7 +680,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev, | |||
679 | /* | 680 | /* |
680 | * register OF I2C devices | 681 | * register OF I2C devices |
681 | */ | 682 | */ |
682 | of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node); | 683 | of_i2c_register_devices(&cpm->adap); |
683 | 684 | ||
684 | return 0; | 685 | return 0; |
685 | out_shut: | 686 | out_shut: |