Commit 2514cca0 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 5394/1: Add static bus numbering support to i2c-versatile

If dev->id is not -1, the platform code may use static bus numbering
rather than dynamic. The patch also changes the i2c_versatile_init to a
subsys_initcall rather than module_init to make sure it is initialised
before the I2C devices initialisation.

Signed-off-by: default avatarCatalin Marinas <>
Acked-by: default avatarJean Delvare <>
Signed-off-by: default avatarRussell King <>
parent eab184c2
......@@ -102,7 +102,13 @@ static int i2c_versatile_probe(struct platform_device *dev)
i2c->algo = i2c_versatile_algo;
i2c-> = i2c;
ret = i2c_bit_add_bus(&i2c->adap);
if (dev->id >= 0) {
/* static bus numbering */
i2c-> = 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,7 +152,7 @@ static void __exit i2c_versatile_exit(void)
MODULE_DESCRIPTION("ARM Versatile I2C bus driver");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment