1 files changed, 24 insertions, 8 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index ad415e6ec5a1..326652f673f7 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -547,15 +547,18 @@ config I2C_PUV3
 
 config I2C_PXA
         tristate "Intel PXA2XX I2C adapter"
-        depends on ARCH_PXA || ARCH_MMP
+        depends on ARCH_PXA || ARCH_MMP || (X86_32 && PCI && OF)
         help
           If you have devices in the PXA I2C bus, say yes to this option.
           This driver can also be built as a module.  If so, the module
           will be called i2c-pxa.
 
+config I2C_PXA_PCI
+        def_bool I2C_PXA && X86_32 && PCI && OF
+
 config I2C_PXA_SLAVE
         bool "Intel PXA2XX I2C Slave comms support"
-        depends on I2C_PXA
+        depends on I2C_PXA && !X86_32
         help
           Support I2C slave mode communications on the PXA I2C bus.  This
           is necessary for systems where the PXA may be a target on the
@@ -668,15 +671,28 @@ config I2C_XILINX
           will be called xilinx_i2c.
 
 config I2C_EG20T
-        tristate "PCH I2C of Intel EG20T"
-        depends on PCI
-        help
-          This driver is for PCH(Platform controller Hub) I2C of EG20T which
-          is an IOH(Input/Output Hub) for x86 embedded processor.
-          This driver can access PCH I2C bus device.
+        tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH"
+        depends on PCI
+        help
+          This driver is for PCH(Platform controller Hub) I2C of EG20T which
+          is an IOH(Input/Output Hub) for x86 embedded processor.
+          This driver can access PCH I2C bus device.
+
+          This driver also supports the ML7213, a companion chip for the
+          Atom E6xx series and compatible with the Intel EG20T PCH.
 
 comment "External I2C/SMBus adapter drivers"
 
+config I2C_DIOLAN_U2C
+        tristate "Diolan U2C-12 USB adapter"
+        depends on USB
+        help
+          If you say yes to this option, support will be included for Diolan
+          U2C-12, a USB to I2C interface.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-diolan-u2c.
+
 config I2C_PARPORT
         tristate "Parallel port adapter"
         depends on PARPORT