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

* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
  i2c: Add support for Xilinx XPS IIC Bus Interface
  i2c: omap: Add support for 16-bit registers
  i2c-pnx: fix setting start/stop condition
  powerpc: doc/dts-bindings: update doc of FSL I2C bindings
  i2c-mpc: add support for the MPC512x processors from Freescale
  i2c-mpc: rename "setclock" initialization functions to "setup"
  i2c-mpc: use __devinit[data] for initialization functions and data
  i2c/imx: don't add probe function to the driver struct
  i2c: Add support for Ux500/Nomadik I2C controller

1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 4cd1ff77ceda..9c6170cd9aac 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -421,13 +421,12 @@ config I2C_IXP2000
           instead.
 
 config I2C_MPC
-        tristate "MPC107/824x/85xx/52xx/86xx"
+        tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
         depends on PPC32
         help
           If you say yes to this option, support will be included for the
-          built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
-          MPC85xx/MPC8641 family processors. The driver may also work on 52xx
-          family processors, though interrupts are known not to work.
+          built-in I2C interface on the MPC107, Tsi107, MPC512x, MPC52xx,
+          MPC8240, MPC8245, MPC83xx, MPC85xx and MPC8641 family processors.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-mpc.
@@ -442,6 +441,13 @@ config I2C_MV64XXX
           This driver can also be built as a module.  If so, the module
           will be called i2c-mv64xxx.
 
+config I2C_NOMADIK
+        tristate "ST-Ericsson Nomadik/Ux500 I2C Controller"
+        depends on PLAT_NOMADIK
+        help
+          If you say yes to this option, support will be included for the
+          I2C interface from ST-Ericsson's Nomadik and Ux500 architectures.
+
 config I2C_OCORES
         tristate "OpenCores I2C Controller"
         depends on EXPERIMENTAL
@@ -577,6 +583,16 @@ config I2C_OCTEON
           This driver can also be built as a module.  If so, the module
           will be called i2c-octeon.
 
+config I2C_XILINX
+        tristate "Xilinx I2C Controller"
+        depends on EXPERIMENTAL && HAS_IOMEM
+        help
+          If you say yes to this option, support will be included for the
+          Xilinx I2C controller.
+
+          This driver can also be built as a module.  If so, the module
+          will be called xilinx_i2c.
+
 comment "External I2C/SMBus adapter drivers"
 
 config I2C_PARPORT