Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-versatile.c

diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c
index 081d9578ce103ac90ddb1143fa8279082151ea1a..fede619ba227b2c5ef9e45f5be24af056f93661a 100644 (file)
--- a/drivers/i2c/busses/i2c-versatile.c
+++ b/drivers/i2c/busses/i2c-versatile.c
@@ -102,7 +102,13 @@ static int i2c_versatile_probe(struct platform_device *dev)
        i2c->algo = i2c_versatile_algo;
        i2c->algo.data = i2c;
 
-       ret = i2c_bit_add_bus(&i2c->adap);
+       if (dev->id >= 0) {
+               /* static bus numbering */
+               i2c->adap.nr = dev->id;
+               ret = i2c_bit_add_numbered_bus(&i2c->adap);
+       } else
+               /* dynamic bus numbering */
+               ret = i2c_bit_add_bus(&i2c->adap);
        if (ret >= 0) {
                platform_set_drvdata(dev, i2c);
                return 0;
@@ -146,8 +152,9 @@ static void __exit i2c_versatile_exit(void)
        platform_driver_unregister(&i2c_versatile_driver);
 }
 
-module_init(i2c_versatile_init);
+subsys_initcall(i2c_versatile_init);
 module_exit(i2c_versatile_exit);
 
 MODULE_DESCRIPTION("ARM Versatile I2C bus driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:versatile-i2c");