i2c-s3c2410: Pass I2C bus number via platform data
Subsystems (2)
Allow the platform data to specify the bus bumber of the I2C bus (or automatically choose one) for the driver.
drivers/i2c/busses/i2c-s3c2410.c +14 -1
@@ -753,9 +753,12 @@ static int s3c24xx_i2c_init(struct s3c24static int s3c24xx_i2c_probe (struct platform_device *pdev) {struct s3c24xx_i2c *i2c = &s3c24xx_i2c; +struct s3c2410_platform_i2c *pdata;struct resource *res;int ret; + pdata =s3c24xx_i2c_get_platformdata (&pdev->dev); +/* find the clock and enable it */ i2c->dev = &pdev->dev;
@@ -833,7 +836,17 @@ static int s3c24xx_i2c_probe(struct platdev_dbg (&pdev->dev,"irq resource %p (%lu)\n" , res, (unsigned long )res->start); - ret =i2c_add_adapter (&i2c->adap); + i2c->adap.nr = pdata->bus_num; + +/* if there is no bus specified, then use a dynamic number to +* register. If there has been none set (ie, 0) then you will +* get i2c bus 0. */ + +if (pdata->bus_num <0 ) + ret =i2c_add_adapter (&i2c->adap); +else + ret =i2c_add_numbered_adapter (&i2c->adap); +if (ret <0 ) {dev_err (&pdev->dev,"failed to add bus to i2c core\n" ); goto err_irq;
include/asm-arm/plat-s3c/iic.h +3 -0
@@ -13,6 +13,8 @@#ifndef __ASM_ARCH_IIC_H#define __ASM_ARCH_IIC_H __FILE__ +#define S3C_IIC_BUS_AUTO (-1)/* use next available bus number */ +#define S3C_IICFLG_FILTER (1<<0)/* enable s3c2440 filter */ /* Notes:
@@ -21,6 +23,7 @@*/ struct s3c2410_platform_i2c { +int bus_num;/* bus number to use */ unsigned int flags;unsigned int slave_addr;/* slave address for controller */ unsigned long bus_freq;/* standard bus frequency */
Signature · 8 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes' _______________________________________________ i2c mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/i2c
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 4 lines · Ben Dooks
Allow the platform data to specify the bus bumber of the I2C bus (or automatically choose one) for the driver.
Signed-off-by Ben Dooks <[email protected]>
Did this get lost in the list traffic or should it have been sent to someone specific to get it merged during the now defunct merge window?
Quoted 58 lines
Index:
linux-2.6.22-16/drivers/i2c/busses/i2c-s3c2410.c
===================================================================drivers/i2c/busses/i2c-s3c2410.c +14
-1@@ -753,9 +753,12 @@ static int s3c24xx_i2c_init(struct s3c24static int s3c24xx_i2c_probe (struct platform_device *pdev) {struct s3c24xx_i2c *i2c = &s3c24xx_i2c; +struct s3c2410_platform_i2c *pdata;struct resource *res;int ret; + pdata =s3c24xx_i2c_get_platformdata (&pdev->dev); +/* find the clock and enable it */ i2c->dev = &pdev->dev;@@ -833,7 +836,17 @@ static int s3c24xx_i2c_probe(struct platdev_dbg (&pdev->dev,"irq resource %p (%lu)\n" , res, (unsigned long )res->start); - ret =i2c_add_adapter (&i2c->adap); + i2c->adap.nr = pdata->bus_num; + +/* if there is no bus specified, then use a dynamic number to +* register. If there has been none set (ie, 0) then you will +* get i2c bus 0. */ + +if (pdata->bus_num <0 ) + ret =i2c_add_adapter (&i2c->adap); +else + ret =i2c_add_numbered_adapter (&i2c->adap); +if (ret <0 ) {dev_err (&pdev->dev,"failed to add bus to i2c core\n" ); goto err_irq;Index:
linux-2.6.22-16/include/asm-arm/plat-s3c/iic.h
===================================================================include/asm-arm/plat-s3c/iic.h +3
-0@@ -13,6 +13,8 @@#ifndef __ASM_ARCH_IIC_H#define __ASM_ARCH_IIC_H __FILE__ +#define S3C_IIC_BUS_AUTO (-1)/* use next available bus number */ +#define S3C_IICFLG_FILTER (1<<0)/* enable s3c2440 filter */ /* Notes: @@ -21,6 +23,7 @@*/ struct s3c2410_platform_i2c { +int bus_num;/* bus number to use */ unsigned int flags;unsigned int slave_addr;/* slave address for controller */ unsigned long bus_freq;/* standard bus frequency */
Signature · 8 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes' _______________________________________________ i2c mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/i2c
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Ben,
Quoted 9 lines · Ben Dooks
Quoted 4 lines · Ben Dooks
Allow the platform data to specify the bus bumber of the I2C bus (or automatically choose one) for the driver.
Signed-off-by Ben Dooks <[email protected]>Did this get lost in the list traffic or should it have been sent to someone specific to get it merged during the now defunct merge window?
Lost in the traffic, I'm reviewing it just now, sorry.
That being said, you sent this patch on January 31st while I issued my i2c git pull request to Linus on January 27th, so it was already too late. If you want changes to go upstream quickly, you shouldn't wait until the last minute for submitting them. Any change should be included in at least one -mm (or now linux-next) release before I consider pushing it upstream!
Signature · 6 lines
Jean Delvare _______________________________________________ i2c mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/i2c
Hi Ben,
Quoted 4 lines · Ben Dooks
Allow the platform data to specify the bus bumber of the I2C bus (or automatically choose one) for the driver.
Signed-off-by Ben Dooks <[email protected]>
Review:
Quoted 19 lines
Index:
linux-2.6.22-16/drivers/i2c/busses/i2c-s3c2410.c
===================================================================drivers/i2c/busses/i2c-s3c2410.c +3
-0@@ -753,9 +753,12 @@ static int s3c24xx_i2c_init(struct s3c24static int s3c24xx_i2c_probe (struct platform_device *pdev) {struct s3c24xx_i2c *i2c = &s3c24xx_i2c; +struct s3c2410_platform_i2c *pdata;struct resource *res;int ret; + pdata =s3c24xx_i2c_get_platformdata (&pdev->dev); +/* find the clock and enable it */ i2c->dev = &pdev->dev;
drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_probe(struct plat · line 839
Quoted 5 lines
drivers/i2c/busses/i2c-s3c2410.c +1
-1@@ -833,7 +836,17 @@ static int s3c24xx_i2c_probe(struct platdev_dbg (&pdev->dev,"irq resource %p (%lu)\n" , res, (unsigned long )res->start); - ret =i2c_add_adapter (&i2c->adap); + i2c->adap.nr = pdata->bus_num;
This should be moved...
drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_probe(struct plat · line 847
Quoted 8 lines
drivers/i2c/busses/i2c-s3c2410.c +8
-0+ +/* if there is no bus specified, then use a dynamic number to +* register. If there has been none set (ie, 0) then you will +* get i2c bus 0. */ + +if (pdata->bus_num <0 ) + ret =i2c_add_adapter (&i2c->adap); +else
... here. You aren't supposed to set i2c->adap.nr if you don't call i2c_add_numbered_adapter().
Quoted 20 lines
drivers/i2c/busses/i2c-s3c2410.c +2
-0+ ret =i2c_add_numbered_adapter (&i2c->adap); +if (ret <0 ) {dev_err (&pdev->dev,"failed to add bus to i2c core\n" ); goto err_irq;Index:
linux-2.6.22-16/include/asm-arm/plat-s3c/iic.h
===================================================================include/asm-arm/plat-s3c/iic.h +2
-0@@ -13,6 +13,8 @@#ifndef __ASM_ARCH_IIC_H#define __ASM_ARCH_IIC_H __FILE__ +#define S3C_IIC_BUS_AUTO (-1)/* use next available bus number */ +#define S3C_IICFLG_FILTER (1<<0)/* enable s3c2440 filter */ /* Notes:
include/asm-arm/plat-s3c/iic.h line 29
Quoted 7 lines
include/asm-arm/plat-s3c/iic.h +1
-0@@ -21,6 +23,7 @@*/ struct s3c2410_platform_i2c { +int bus_num;/* bus number to use */ unsigned int flags;unsigned int slave_addr;/* slave address for controller */ unsigned long bus_freq;/* standard bus frequency */
Other than that the patch looks OK to me, although I am wondering if it's not more complex than it needs to be. Other i2c bus drivers for embedded platforms call i2c_add_numbered_adapter() unconditionally, using the platform device id to set the bus number. This takes less code. Maybe you should consider this for the s3c24xx platform, unless there are additional constraints I do not know.
Thanks,
Signature · 6 lines
Jean Delvare _______________________________________________ i2c mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/i2c