Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

Pull i2c-embedded changes from Wolfram Sang:
 "The changes for i2c-embedded include:

   - massive rework of the omap driver
   - massive rework of the at91 driver.  In fact, the old driver gets
     removed; I am okay with this approach since the old driver was
     depending on BROKEN and its limitations made it practically
     unusable, so people used bitbanging instead.  But even if there are
     users, there is no platform_data or module parameter which would
     need to be converted.  It is just another driver doing I2C
     transfers, just way better.  Modifications of arch/arm/at91 related
     files have proper acks from the maintainer.
   - new driver for R-Car I2C
   - devicetree and generic_clock conversions and fixes
   - usual driver fixes and changes.

  The rework patches have come a long way and lots of people have been
  involved in creating/testing them.  Most patches have been in
  linux-next at least since 3.6-rc5.  A few have been added in the last
  week, I have to admit.

  An unexpected (but welcome :)) peak in private life is the cause for
  that.  The "late" patches shouldn't cause any merge conflicts and I
  will have a special eye on them during the stabilization phase.  This
  is an exception and I want to have the patches in place properly in
  time again for the next kernels."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
  MXS: Implement DMA support into mxs-i2c
  i2c: add Renesas R-Car I2C driver
  i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
  ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
  i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
  i2c: algo: pca: Fix chip reset function for PCA9665
  i2c: mpc: Wait for STOP to hit the bus
  i2c: davinci: preparation for switch to common clock framework
  omap-i2c: fix incorrect log message when using a device tree
  i2c: omap: sanitize exit path
  i2c: omap: switch over to autosuspend API
  i2c: omap: remove unnecessary pm_runtime_suspended check
  i2c: omap: switch to threaded IRQ support
  i2c: omap: remove redundant status read
  i2c: omap: get rid of the "complete" label
  i2c: omap: resize fifos before each message
  i2c: omap: simplify IRQ exit path
  i2c: omap: always return IRQ_HANDLED
  i2c: omap: simplify errata check
  i2c: omap: bus: add a receiver flag
  ...

1 files changed, 20 insertions, 7 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index ff01c389e2da..65dd599a0262 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -294,18 +294,21 @@ comment "I2C system bus drivers (mostly embedded / system-on-chip)"
 
 config I2C_AT91
         tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
-        depends on ARCH_AT91 && EXPERIMENTAL && BROKEN
+        depends on ARCH_AT91 && EXPERIMENTAL
         help
           This supports the use of the I2C interface on Atmel AT91
           processors.
 
-          This driver is BROKEN because the controller which it uses
-          will easily trigger RX overrun and TX underrun errors.  Using
-          low I2C clock rates may partially work around those issues
-          on some systems.  Another serious problem is that there is no
-          documented way to issue repeated START conditions, as needed
+          A serious problem is that there is no documented way to issue
+          repeated START conditions for more than two messages, as needed
           to support combined I2C messages.  Use the i2c-gpio driver
-          unless your system can cope with those limitations.
+          unless your system can cope with this limitation.
+
+          Caution! at91rm9200, at91sam9261, at91sam9260, at91sam9263 devices
+          don't have clock stretching in transmission mode. For that reason,
+          you can encounter underrun issues causing premature stop sendings if
+          the latency to fill the transmission register is too long. If you
+          are facing this situation, use the i2c-gpio driver.
 
 config I2C_AU1550
         tristate "Au1550/Au1200/Au1300 SMBus interface"
@@ -718,6 +721,16 @@ config I2C_XLR
           This driver can also be built as a module.  If so, the module
           will be called i2c-xlr.
 
+config I2C_RCAR
+        tristate "Renesas R-Car I2C Controller"
+        depends on ARCH_SHMOBILE && I2C
+        help
+          If you say yes to this option, support will be included for the
+          R-Car I2C controller.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-rcar.
+
 comment "External I2C/SMBus adapter drivers"
 
 config I2C_DIOLAN_U2C