i2c-bfin-twi: Register adapter with a specific bus number

All the users of this driver explicitly specify the I2C bus numbers
to be used in their platform data. Make the driver respect that.

Signed-off-by: Kalle Pokki <kalle.pokki@eke.fi>
Cc: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 67224a424aba4cbf659cb969b57d9fb24c1e1d81..7dbdaeb707a99c0caf78290f4263f7ceb515a475 100644 (file)
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -550,6 +550,7 @@ static int i2c_bfin_twi_probe(struct platform_device *dev)
 
        p_adap = &iface->adap;
        p_adap->id = I2C_HW_BLACKFIN;
+       p_adap->nr = dev->id;
        strlcpy(p_adap->name, dev->name, sizeof(p_adap->name));
        p_adap->algo = &bfin_twi_algorithm;
        p_adap->algo_data = iface;
@@ -576,7 +577,7 @@ static int i2c_bfin_twi_probe(struct platform_device *dev)
        bfin_write_TWI_CONTROL(bfin_read_TWI_CONTROL() | TWI_ENA);
        SSYNC();
 
-       rc = i2c_add_adapter(p_adap);
+       rc = i2c_add_numbered_adapter(p_adap);
        if (rc < 0)
                free_irq(iface->irq, iface);
        else