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

diff --combined drivers/i2c/busses/Kconfig
index 4cd1ff77cedaea4bb3d292270c4e883b1746de12,02afe89de165ceefb3ad51759a6505990be76358..9c6170cd9aac74b1d467fd629b8edbc5ad08a20a
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -106,8 -106,6 +106,8 @@@ config I2C_I80
  config I2C_ISCH
        tristate "Intel SCH SMBus 1.0"
        depends on PCI
 +      select MFD_CORE
 +      select LPC_SCH
        help
          Say Y here if you want to use SMBus controller on the Intel SCH
          based systems.
@@@ -421,13 -419,12 +421,12 @@@ config I2C_IXP200
          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 -439,13 +441,13 @@@ config I2C_MV64XX
          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 -581,16 +583,16 @@@ config I2C_OCTEO
          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