forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c: Add OF-style registration and binding

Browse source 
This patch adds OF hooks to the i2c core so that devices can automatically
be registered based on device tree data.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely 2010-06-08 07:48:19 -06:00
commit 959e85f775
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/i2c/busses/i2c-cpm.c
View file

@ -677,11 +677,6 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
dev_dbg(&ofdev->dev, "hw routines for %s registered.\n", dev_dbg(&ofdev->dev, "hw routines for %s registered.\n",
cpm->adap.name); cpm->adap.name);
/*
* register OF I2C devices
*/
of_i2c_register_devices(&cpm->adap);
return 0; return 0;
out_shut: out_shut:
cpm_i2c_shutdown(cpm); cpm_i2c_shutdown(cpm);

3
drivers/i2c/busses/i2c-ibm_iic.c
View file

@ -761,9 +761,6 @@ static int __devinit iic_probe(struct of_device *ofdev,
dev_info(&ofdev->dev, "using %s mode\n", dev_info(&ofdev->dev, "using %s mode\n",
dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)"); dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
/* Now register all the child nodes */
of_i2c_register_devices(adap);
return 0; return 0;
error_cleanup: error_cleanup:

1
drivers/i2c/busses/i2c-mpc.c
View file

@ -607,7 +607,6 @@ static int __devinit fsl_i2c_probe(struct of_device *op,
dev_err(i2c->dev, "failed to add adapter\n"); dev_err(i2c->dev, "failed to add adapter\n");
goto fail_add; goto fail_add;
} }
of_i2c_register_devices(&i2c->adap);
return result; return result;

9
drivers/i2c/i2c-core.c
View file

@ -30,6 +30,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of_i2c.h>
#include <linux/of_device.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
@ -70,6 +72,10 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
if (!client) if (!client)
return 0; return 0;
/* Attempt an OF style match */
if (of_driver_match_device(dev, drv))
return 1;
driver = to_i2c_driver(drv); driver = to_i2c_driver(drv);
/* match on an id table if there is one */ /* match on an id table if there is one */
if (driver->id_table) if (driver->id_table)
@ -790,6 +796,9 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
if (adap->nr < __i2c_first_dynamic_bus_num) if (adap->nr < __i2c_first_dynamic_bus_num)
i2c_scan_static_board_info(adap); i2c_scan_static_board_info(adap);
/* Register devices from the device tree */
of_i2c_register_devices(adap);
/* Notify drivers */ /* Notify drivers */
mutex_lock(&core_lock); mutex_lock(&core_lock);
dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap, dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,