Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:
 - new drivers: Kontron PLD, Wondermedia VT
 - mv64xxx driver gained sun4i support and a bigger cleanup
 - duplicate driver 'intel-mid' removed
 - added generic device tree binding for sda holding time (and
   designware driver already uses it)
 - we tried to allow driver probing with only device tree and no i2c
   ids, but I had to revert it because of side effects.  Needs some
   rethinking.
 - driver bugfixes, cleanups...

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (34 commits)
  i2c-designware: use div_u64 to fix link
  i2c: Kontron PLD i2c bus driver
  i2c: iop3xxx: fix build failure after waitqueue changes
  i2c-designware: make SDA hold time configurable
  i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided
  i2c: imx: allow autoloading on dt ids
  i2c: mv64xxx: Fix transfer error code
  i2c: i801: SMBus patch for Intel Coleto Creek DeviceIDs
  i2c: omap: correct usage of the interrupt enable register
  i2c-pxa: prepare clock before use
  Revert "i2c: core: make it possible to match a pure device tree driver"
  i2c: nomadik: allocate adapter number dynamically
  i2c: nomadik: support elder Nomadiks
  i2c: mv64xxx: Add Allwinner sun4i compatible
  i2c: mv64xxx: make the registers offset configurable
  i2c: mv64xxx: Add macros to access parts of registers
  i2c: vt8500: Add support for I2C bus on Wondermedia SoCs
  i2c: designware: fix race between subsequent xfers
  i2c: bfin-twi: Read and write the FIFO in loop
  i2c: core: make it possible to match a pure device tree driver
  ...

1 files changed, 23 insertions, 11 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 527503617ee2..fdc2ab4af315 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -108,6 +108,7 @@ config I2C_I801
             Lynx Point-LP (PCH)
             Avoton (SOC)
             Wellsburg (PCH)
+            Coleto Creek (PCH)
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-i801.
@@ -475,16 +476,6 @@ config I2C_IMX
           This driver can also be built as a module.  If so, the module
           will be called i2c-imx.
 
-config I2C_INTEL_MID
-        tristate "Intel Moorestown/Medfield Platform I2C controller"
-        depends on PCI
-        help
-          Say Y here if you have an Intel Moorestown/Medfield platform I2C
-          controller.
-
-          This support is also available as a module. If so, the module
-          will be called i2c-intel-mid.
-
 config I2C_IOP3XX
         tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
         depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
@@ -495,6 +486,16 @@ config I2C_IOP3XX
           This driver can also be built as a module.  If so, the module
           will be called i2c-iop3xx.
 
+config I2C_KEMPLD
+        tristate "Kontron COM I2C Controller"
+        depends on MFD_KEMPLD
+        help
+          This enables support for the I2C bus interface on some Kontron ETX
+          and COMexpress (ETXexpress) modules.
+
+          This driver can also be built as a module. If so, the module
+          will be called i2c-kempld.
+
 config I2C_MPC
         tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
         depends on PPC
@@ -508,10 +509,11 @@ config I2C_MPC
 
 config I2C_MV64XXX
         tristate "Marvell mv64xxx I2C Controller"
-        depends on (MV64X60 || PLAT_ORION)
+        depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Marvell 64xxx line of host bridges.
+          This driver is also used for Allwinner SoCs I2C controllers.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-mv64xxx.
@@ -725,6 +727,16 @@ config I2C_VERSATILE
           This driver can also be built as a module.  If so, the module
           will be called i2c-versatile.
 
+config I2C_WMT
+        tristate "Wondermedia WM8xxx SoC I2C bus support"
+        depends on ARCH_VT8500
+        help
+          Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
+          SoCs.
+
+          This driver can also be built as a module. If so, the module will be
+          called i2c-wmt.
+
 config I2C_OCTEON
         tristate "Cavium OCTEON I2C bus support"
         depends on CPU_CAVIUM_OCTEON