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

* 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux: (47 commits)
  i2c-s3c2410: Add device tree support
  i2c-s3c2410: Keep a copy of platform data and use it
  i2c-nomadik: cosmetic coding style corrections
  i2c-au1550: dev_pm_ops conversion
  i2c-au1550: increase timeout waiting for master done
  i2c-au1550: remove unused ack_timeout
  i2c-au1550: remove usage of volatile keyword
  i2c-tegra: __iomem annotation fix
  i2c-eg20t: Add initialize processing in case i2c-error occurs
  i2c-eg20t: Fix flag setting issue
  i2c-eg20t: add stop sequence in case wait-event timeout occurs
  i2c-eg20t: Separate error processing
  i2c-eg20t: Fix 10bit access issue
  i2c-eg20t: Modify returned value s32 to long
  i2c-eg20t: Fix bus-idle waiting issue
  i2c-designware: Fix PCI core warning on suspend/resume
  i2c-designware: Add runtime power management support
  i2c-designware: Add support for Designware core behind PCI devices.
  i2c-designware: Push all register reads/writes into the core code.
  i2c-designware: Support multiple cores using same ISR
  ...

diff --combined drivers/i2c/busses/Kconfig
index d1fc5cf,1d7ce9c..b2b8562
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -350,15 -350,25 +350,25 @@@ config I2C_DAVINC
          devices such as DaVinci NIC.
          For details please see http://www.ti.com/davinci
  
- config I2C_DESIGNWARE
-       tristate "Synopsys DesignWare"
+ config I2C_DESIGNWARE_PLATFORM
+       tristate "Synopsys DesignWare Platfrom"
        depends on HAVE_CLK
        help
          If you say yes to this option, support will be included for the
          Synopsys DesignWare I2C adapter. Only master mode is supported.
  
          This driver can also be built as a module.  If so, the module
-         will be called i2c-designware.
+         will be called i2c-designware-platform.
+ 
+ config I2C_DESIGNWARE_PCI
+       tristate "Synopsys DesignWare PCI"
+       depends on PCI
+       help
+         If you say yes to this option, support will be included for the
+         Synopsys DesignWare I2C adapter. Only master mode is supported.
+ 
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-designware-pci.
  
  config I2C_GPIO
        tristate "GPIO-based bitbanging I2C"
@@@ -789,7 -799,7 +799,7 @@@ config I2C_ACOR
  
  config I2C_ELEKTOR
        tristate "Elektor ISA card"
 -      depends on ISA && BROKEN_ON_SMP
 +      depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
        select I2C_ALGOPCF
        help
          This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own