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]>
Index: linux-2.6.22-16/drivers/i2c/busses/i2c-s3c2410.c
===================================================================
--- linux-2.6.22-16.orig/drivers/i2c/busses/i2c-s3c2410.c
+++ linux-2.6.22-16/drivers/i2c/busses/i2c-s3c2410.c
@@ -753,9 +753,12 @@ static int s3c24xx_i2c_init(struct s3c24
static 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 plat
dev_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
===================================================================
--- linux-2.6.22-16.orig/include/asm-arm/plat-s3c/iic.h
+++ linux-2.6.22-16/include/asm-arm/plat-s3c/iic.h
@@ -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 */
--
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
