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

[deliverable/linux.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index de17c5593d97c1d702563217f0932aa0a0aee6bd..620d1004a1e76a49afc9c5ea3a7c3b5be62422d7 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -110,6 +110,7 @@ config I2C_I801
            Wellsburg (PCH)
            Coleto Creek (PCH)
            Wildcat Point-LP (PCH)
+           BayTrail (SOC)
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -375,6 +376,13 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
        help
          The unit of the TWI clock is kHz.
 
+config I2C_CADENCE
+       tristate "Cadence I2C Controller"
+       depends on ARCH_ZYNQ
+       help
+         Say yes here to select Cadence I2C Host Controller. This controller is
+         e.g. used by Xilinx Zynq.
+
 config I2C_CBUS_GPIO
        tristate "CBUS I2C driver"
        depends on GPIOLIB
@@ -432,9 +440,16 @@ config I2C_DESIGNWARE_PCI
          This driver can also be built as a module.  If so, the module
          will be called i2c-designware-pci.
 
+config I2C_EFM32
+       tristate "EFM32 I2C controller"
+       depends on ARCH_EFM32 || COMPILE_TEST
+       help
+         This driver supports the i2c block found in Energy Micro's EFM32
+         SoCs.
+
 config I2C_EG20T
        tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C"
-       depends on PCI
+       depends on PCI && (X86_32 || COMPILE_TEST)
        help
          This driver is for PCH(Platform controller Hub) I2C of EG20T which
          is an IOH(Input/Output Hub) for x86 embedded processor.
@@ -527,7 +542,7 @@ config I2C_MPC
 
 config I2C_MV64XXX
        tristate "Marvell mv64xxx I2C Controller"
-       depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
+       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.
@@ -555,13 +570,6 @@ config I2C_NOMADIK
          I2C interface from ST-Ericsson's Nomadik and Ux500 architectures,
          as well as the STA2X11 PCIe I/O HUB.
 
-config I2C_NUC900
-       tristate "NUC900 I2C Driver"
-       depends on ARCH_W90X900
-       help
-         Say Y here to include support for I2C controller in the
-         Winbond/Nuvoton NUC900 based System-on-Chip devices.
-
 config I2C_OCORES
        tristate "OpenCores I2C Controller"
        help
@@ -648,6 +656,16 @@ config I2C_PXA_SLAVE
          is necessary for systems where the PXA may be a target on the
          I2C bus.
 
+config I2C_QUP
+       tristate "Qualcomm QUP based I2C controller"
+       depends on ARCH_QCOM
+       help
+         If you say yes to this option, support will be included for the
+         built-in I2C interface on the Qualcomm SoCs.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-qup.
+
 config I2C_RIIC
        tristate "Renesas RIIC adapter"
        depends on ARCH_SHMOBILE || COMPILE_TEST
@@ -936,7 +954,7 @@ config I2C_ACORN
 
 config I2C_ELEKTOR
        tristate "Elektor ISA card"
-       depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
+       depends on ISA && HAS_IOPORT_MAP && BROKEN_ON_SMP
        select I2C_ALGOPCF
        help
          This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
@@ -968,6 +986,15 @@ config I2C_SIBYTE
        help
          Supports the SiByte SOC on-chip I2C interfaces (2 channels).
 
+config I2C_CROS_EC_TUNNEL
+       tristate "ChromeOS EC tunnel I2C bus"
+       depends on MFD_CROS_EC
+       help
+         If you say yes here you get an I2C bus that will tunnel i2c commands
+         through to the other side of the ChromeOS EC to the i2c bus
+         connected there. This will work whatever the interface used to
+         talk to the EC (SPI, I2C or LPC).
+
 config SCx200_I2C
        tristate "NatSemi SCx200 I2C using GPIO pins (DEPRECATED)"
        depends on SCx200_GPIO