Convert i2c-mpc from a platform driver into a of_platform driver, V3
Subsystems (5)
PATCH 1/2 Convert i2c-mpc from a platform driver into a of_platform driver, V3
Convert i2c-mpc to an of_platform driver. Utilize the code in drivers/of-i2c.c to make i2c modules dynamically loadable by the device tree.
---
arch/powerpc/sysdev/fsl_soc.c | 122 ----------------------------------------- drivers/i2c/busses/i2c-mpc.c | 104 ++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 166 deletions(-)
arch/powerpc/sysdev/fsl_soc.c +0 -122
@@ -414,128 +414,6 @@ err:arch_initcall (gfar_of_init); -#ifdef CONFIG_I2C_BOARDINFO -#include <linux/i2c.h> -struct i2c_driver_device { -char *of_device; -char *i2c_type; -}; - -static struct i2c_driver_device i2c_devices[]__initdata = { - {"ricoh,rs5c372a" ,"rs5c372a" }, - {"ricoh,rs5c372b" ,"rs5c372b" }, - {"ricoh,rv5c386" ,"rv5c386" }, - {"ricoh,rv5c387a" ,"rv5c387a" }, - {"dallas,ds1307" ,"ds1307" }, - {"dallas,ds1337" ,"ds1337" }, - {"dallas,ds1338" ,"ds1338" }, - {"dallas,ds1339" ,"ds1339" }, - {"dallas,ds1340" ,"ds1340" }, - {"stm,m41t00" ,"m41t00" }, - {"dallas,ds1374" ,"rtc-ds1374" }, -}; - -static int __init of_find_i2c_driver (struct device_node *node, -struct i2c_board_info *info) -{ -int i; - -for (i =0 ; i <ARRAY_SIZE (i2c_devices); i++) { -if (!of_device_is_compatible (node, i2c_devices[i].of_device)) -continue ; -if (strlcpy (info->type, i2c_devices[i].i2c_type, -I2C_NAME_SIZE ) >=I2C_NAME_SIZE ) -return -ENOMEM ; -return 0 ; - } -return -ENODEV ; -} - -static void __init of_register_i2c_devices (struct device_node *adap_node, -int bus_num) -{ -struct device_node *node =NULL ; - -while ((node =of_get_next_child (adap_node, node))) { -struct i2c_board_info info = {}; -const u32 *addr; -int len; - - addr =of_get_property (node,"reg" , &len); -if (!addr || len <sizeof (int ) || *addr > (1 <<10 ) -1 ) { -printk (KERN_WARNING "fsl_soc.c: invalid i2c device entry\n" ); -continue ; - } - - info.irq =irq_of_parse_and_map (node,0 ); -if (info.irq ==NO_IRQ ) - info.irq =-1 ; - -if (of_find_i2c_driver (node, &info) <0 ) -continue ; - - info.addr = *addr; - -i2c_register_board_info (bus_num, &info,1 ); - } -} - -static int __init fsl_i2c_of_init (void ) -{ -struct device_node *np; -unsigned int i =0 ; -struct platform_device *i2c_dev; -int ret; - -for_each_compatible_node (np,NULL ,"fsl-i2c" ) { -struct resource r[2 ]; -struct fsl_i2c_platform_data i2c_data; -const unsigned char *flags =NULL ; - -memset (&r,0 ,sizeof (r)); -memset (&i2c_data,0 ,sizeof (i2c_data)); - - ret =of_address_to_resource (np,0 , &r[0 ]); -if (ret) - goto err; - -of_irq_to_resource (np,0 , &r[1 ]); - - i2c_dev =platform_device_register_simple ("fsl-i2c" , i, r,2 ); -if (IS_ERR (i2c_dev)) { - ret =PTR_ERR (i2c_dev); - goto err; - } - - i2c_data.device_flags =0 ; - flags =of_get_property (np,"dfsrr" ,NULL ); -if (flags) - i2c_data.device_flags |=FSL_I2C_DEV_SEPARATE_DFSRR ; - - flags =of_get_property (np,"fsl5200-clocking" ,NULL ); -if (flags) - i2c_data.device_flags |=FSL_I2C_DEV_CLOCK_5200 ; - - ret = -platform_device_add_data (i2c_dev, &i2c_data, -sizeof (struct -fsl_i2c_platform_data )); -if (ret) - goto unreg; - -of_register_i2c_devices (np, i++); - } - -return 0 ; - -unreg: -platform_device_unregister (i2c_dev); -err: -return ret; -} - -arch_initcall (fsl_i2c_of_init); -#endif #ifdef CONFIG_PPC_83xxstatic int __init mpc83xx_wdt_init (void )
drivers/i2c/busses/i2c-mpc.c +60 -44
182 lines not on this page · raw message
PATCH 2/2 Add the of_find_i2c_device_by_node function, V3
Add the of_find_i2c_device_by_node function. This allows you to follow a reference in the device to an i2c device node and then locate the linux device instantiated by the device tree. Example use, an i2s codec controlled by i2c.
---
drivers/i2c/i2c-core.c | 2 +- drivers/of/of_i2c.c | 37 ++++++++++++++++++++++++++----------- include/linux/i2c.h | 3 +++ include/linux/of_i2c.h | 2 ++ 4 files changed, 32 insertions(+), 12 deletions(-)
drivers/i2c/i2c-core.c +1 -1
@@ -208,7 +208,7 @@ static struct device_attribute i2c_dev_attrs[] = { { }, }; -static struct bus_type i2c_bus_type = { +struct bus_type i2c_bus_type = { .name ="i2c" , .dev_attrs = i2c_dev_attrs, .match = i2c_device_match,
drivers/of/of_i2c.c +26 -11
@@ -75,7 +75,7 @@ static int of_find_i2c_driver(struct device_node *node,void of_register_i2c_devices (struct i2c_adapter *adap,struct device_node *adap_node) { -void *result; +struct i2c_client *i2c_dev;struct device_node *node;for_each_child_of_node (adap_node, node) {
@@ -90,29 +90,44 @@ void of_register_i2c_devices(struct i2c_adapter *adap,continue ; } - info.irq =irq_of_parse_and_map (node,0 ); -if (info.irq ==NO_IRQ ) - info.irq =-1 ; - -if (of_find_i2c_driver (node, &info) <0 ) { -irq_dispose_mapping (info.irq); +if (of_find_i2c_driver (node, &info) <0 )continue ; - } + info.irq =irq_of_parse_and_map (node,0 ); info.addr = *addr; -request_module (info.type); +request_module ("%s" , info.type); - result =i2c_new_device (adap, &info); -if (result ==NULL ) { + i2c_dev =i2c_new_device (adap, &info); +if (i2c_dev ==NULL ) {printk (KERN_ERR "of-i2c: Failed to load driver for %s\n" , info.type);irq_dispose_mapping (info.irq);continue ; } + + i2c_dev->dev.archdata.of_node =of_node_get (node); } }EXPORT_SYMBOL (of_register_i2c_devices); +static int of_dev_node_match (struct device *dev,void *data) +{ +return dev->archdata.of_node == data; +} + +struct i2c_client *of_find_i2c_device_by_node (struct device_node *node) +{ +struct device *dev; + + dev =bus_find_device (&i2c_bus_type,NULL , node, + of_dev_node_match); +if (!dev) +return NULL ; + +return to_i2c_client (dev); +} +EXPORT_SYMBOL (of_find_i2c_device_by_node); +MODULE_LICENSE ("GPL" );
include/linux/i2c.h +3 -0
@@ -92,6 +92,9 @@ extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,extern s32 i2c_smbus_write_i2c_block_data (struct i2c_client * client,u8 command,u8 length,const u8 *values); + +/* Base of the i2c bus */ +extern struct bus_type i2c_bus_type;/* * A driver is capable of handling one or more physical devices present on
include/linux/of_i2c.h +2 -0
@@ -16,5 +16,7 @@void of_register_i2c_devices (struct i2c_adapter *adap,struct device_node *adap_node); +struct i2c_client *of_find_i2c_device_by_node (struct device_node *node); +#endif /* __LINUX_OF_I2C_H */
_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c
drivers/i2c/busses/i2c-mpc.c static struct i2c_adapter mpc_ops = { · line 347
Quoted 2 lines · Jon Smirl
drivers/i2c/busses/i2c-mpc.c +2
-0+ result =request_irq (i2c->irq, mpc_i2c_isr, +IRQF_SHARED ,"i2c-mpc" , i2c);
That's a rather excessive indentation of the continuation line -- it looks like it was aligned using 4-character tabs. It's best to use spaces for alignment (after using tabs to reach the indentation level), especially if you're using a non-standard tab size.
drivers/i2c/busses/i2c-mpc.c static struct i2c_adapter mpc_ops = { · line 423
Quoted 9 lines
static int
__initfsl_i2c_init(void)
{drivers/i2c/busses/i2c-mpc.c +6
-1-return platform_driver_register (&fsl_i2c_driver); +int rv; + + rv =of_register_platform_driver (&mpc_i2c_driver); +if (rv) + printk(KERN_ERR DRV_NAME +" of_register_platform_driver failed (%i)\n" , rv);
Please align the continuation line with the first parameter.
-Scott