Merge branch 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux

* 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux:
  i2c-bfin-twi: move setup to the earlier subsys initcall
  i2c-bfin-twi: handle faulty slave devices better
  i2c-mv64xxx: send repeated START between messages in xfer
  i2c-nomadik: fix regression on adapter name
  i2c-omap: Set latency requirements only once for several messages
  i2c-eg20t: add driver for Intel EG20T
  i2c-ocores: add some device tree documentation
  i2c-ocores: Use devres for resource allocation
  i2c-ocores: Adapt for device tree
  i2c-iop3xx: add iomem annotation

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 2bd3469b3071..594ed5059c4a 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -872,6 +872,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
         adap->owner     = THIS_MODULE;
         adap->class     = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->algo      = &nmk_i2c_algo;
+        snprintf(adap->name, sizeof(adap->name),
+                 "Nomadik I2C%d at %lx", pdev->id, (unsigned long)res->start);
 
         /* fetch the controller id */
         adap->nr        = pdev->id;
@@ -891,8 +893,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
                 goto err_init_hw;
         }
 
-        dev_dbg(&pdev->dev, "initialize I2C%d bus on virtual "
-                "base %p\n", pdev->id, dev->virtbase);
+        dev_info(&pdev->dev, "initialize %s on virtual "
+                "base %p\n", adap->name, dev->virtbase);
 
         ret = i2c_add_numbered_adapter(adap);
         if (ret) {