summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorFlorian Vaussard <florian.vaussard@epfl.ch>2012-08-31 13:02:55 +0200
committerWolfram Sang <w.sang@pengutronix.de>2012-09-12 15:54:14 +0200
commitc5d3cd6dc2dc106ca9fcc8cb6587754ee6cfc86e (patch)
tree4598b072794457a51c3451ae23feca1063ea1c67 /drivers/i2c
parent0bdfe0cb803dce699ff337c35d8e97ac355fa417 (diff)
downloadop-kernel-dev-c5d3cd6dc2dc106ca9fcc8cb6587754ee6cfc86e.zip
op-kernel-dev-c5d3cd6dc2dc106ca9fcc8cb6587754ee6cfc86e.tar.gz
omap-i2c: fix incorrect log message when using a device tree
When booting using a device tree, the adapter number is dynamically assigned after the log message is sent. This patch modifies the log message to get a correct adapter id. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> Tested-by: Benoit Cousson <b-cousson@ti.com> Acked-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b149e32..c78431a 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1175,9 +1175,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);
-
adap = &dev->adapter;
i2c_set_adapdata(adap, dev);
adap->owner = THIS_MODULE;
@@ -1195,6 +1192,9 @@ 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", adap->nr,
+ dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
+
of_i2c_register_devices(adap);
pm_runtime_mark_last_busy(dev->dev);
OpenPOWER on IntegriCloud