[PATCH 1/2] i2c-omap: Fix incorrect adapter id when booting from a device tree
From: Benoit Cousson <hidden>
Date: 2012-08-31 09:14:20
Also in:
linux-i2c, linux-omap
Hi Florian, On 08/31/2012 09:52 AM, Florian Vaussard wrote:
When booting from a device tree, the omap driver is using pdev->id, which is incorrect.
Not really, see below...
The proposed patch uses aliases, as done in omap-serial.
Mmm, but is it really needed?
In the case of serial the id is important because of the tty number used
as device interface.
In the case of I2C, the id is mostly irrelevant.
In fact, using the pdev->id = -1 was used on purpose to have a dynamic
assignment:
int i2c_add_numbered_adapter(struct i2c_adapter *adap)
...
if (adap->nr == -1) /* -1 means dynamically assign bus id */
return i2c_add_adapter(adap);
quoted hunk ↗ jump to hunk
Signed-off-by: Florian Vaussard <redacted> --- drivers/i2c/busses/i2c-omap.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-)diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 5d19a49..9445d1f 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c@@ -1064,9 +1064,6 @@ omap_i2c_probe(struct platform_device *pdev) goto err_unuse_clocks; } - dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id, - dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed); -
[ 0.658843] omap_i2c i2c.15: bus -1 rev2.4.0 at 400 kHz [ 0.760192] omap_i2c i2c.16: bus -1 rev2.4.0 at 400 kHz [ 0.775817] omap_i2c i2c.17: bus -1 rev2.4.0 at 400 kHz [ 0.791442] omap_i2c i2c.18: bus -1 rev2.4.0 at 400 kHz OK, it is true that the current log is not that nice with bus -1, but maybe we should just remove that. Or we can potentially retrieve the i2c adapter number assign later, and delay the log.
r = i2c_add_numbered_adapter(adap);
if (r) {
dev_err(dev->dev, "failure adding adapter\n");Regards, Benoit
quoted hunk ↗ jump to hunk
adap = &dev->adapter; i2c_set_adapdata(adap, dev); adap->owner = THIS_MODULE;@@ -1076,8 +1073,22 @@ omap_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; + if (adap->dev.of_node) + adap->nr = of_alias_get_id(adap->dev.of_node, "i2c"); + else + adap->nr = pdev->id; + + if (adap->nr < 0) { + dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", + adap->nr); + r = -ENODEV; + goto err_free_irq; + } + + dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", adap->nr, + dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed); + /* i2c device drivers may be active on return from add_adapter() */ - adap->nr = pdev->id; r = i2c_add_numbered_adapter(adap); if (r) { dev_err(dev->dev, "failure adding adapter\n");