Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

[pandora-kernel.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 30f8dbd..9294dc2 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -433,7 +433,7 @@ config I2C_IXP2000
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
-       depends on PPC32
+       depends on PPC
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the MPC107, Tsi107, MPC512x, MPC52xx,
@@ -452,6 +452,16 @@ config I2C_MV64XXX
          This driver can also be built as a module.  If so, the module
          will be called i2c-mv64xxx.
 
+config I2C_MXS
+       tristate "Freescale i.MX28 I2C interface"
+       depends on SOC_IMX28
+       help
+         Say Y here if you want to use the I2C bus controller on
+         the Freescale i.MX28 processors.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-mxs.
+
 config I2C_NOMADIK
        tristate "ST-Ericsson Nomadik/Ux500 I2C Controller"
        depends on PLAT_NOMADIK
@@ -523,6 +533,17 @@ config I2C_PNX
          This driver can also be built as a module.  If so, the module
          will be called i2c-pnx.
 
+config I2C_PUV3
+       tristate "PKUnity v3 I2C bus support"
+       depends on UNICORE32 && ARCH_PUV3
+       select I2C_ALGOBIT
+       help
+         This driver supports the I2C IP inside the PKUnity-v3 SoC.
+         This I2C bus controller is under AMBA/AXI bus.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-puv3.
+
 config I2C_PXA
        tristate "Intel PXA2XX I2C adapter"
        depends on ARCH_PXA || ARCH_MMP
@@ -607,6 +628,13 @@ config I2C_STU300
          This driver can also be built as a module. If so, the module
          will be called i2c-stu300.
 
+config I2C_TEGRA
+       tristate "NVIDIA Tegra internal I2C controller"
+       depends on ARCH_TEGRA
+       help
+         If you say yes to this option, support will be included for the
+         I2C controller embedded in NVIDIA Tegra SOCs
+
 config I2C_VERSATILE
        tristate "ARM Versatile/Realview I2C bus support"
        depends on ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS