Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 71ad6e1..91a488c 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -123,6 +123,7 @@ config I2C_I801
            Wildcat Point-LP (PCH)
            BayTrail (SOC)
            Sunrise Point-H (PCH)
+           Sunrise Point-LP (PCH)
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -523,6 +524,16 @@ config I2C_IBM_IIC
          This driver can also be built as a module.  If so, the module
          will be called i2c-ibm_iic.
 
+config I2C_IMG
+       tristate "Imagination Technologies I2C SCB Controller"
+       depends on MIPS || METAG || COMPILE_TEST
+       help
+         Say Y here if you want to use the IMG I2C SCB controller,
+         available on the TZ1090 and other IMG SoCs.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-img-scb.
+
 config I2C_IMX
        tristate "IMX I2C interface"
        depends on ARCH_MXC
@@ -553,6 +564,13 @@ config I2C_KEMPLD
          This driver can also be built as a module. If so, the module
          will be called i2c-kempld.
 
+config I2C_MESON
+       tristate "Amlogic Meson I2C controller"
+       depends on ARCH_MESON
+       help
+         If you say yes to this option, support will be included for the
+         I2C interface on the Amlogic Meson family of SoCs.
+
 config I2C_MPC
        tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
        depends on PPC
@@ -702,7 +720,7 @@ config I2C_RIIC
 
 config I2C_RK3X
        tristate "Rockchip RK3xxx I2C adapter"
-       depends on OF
+       depends on OF && COMMON_CLK
        help
          Say Y here to include support for the I2C adapter in Rockchip RK3xxx
          SoCs.
@@ -881,6 +899,16 @@ config I2C_DIOLAN_U2C
          This driver can also be built as a module.  If so, the module
          will be called i2c-diolan-u2c.
 
+config I2C_DLN2
+       tristate "Diolan DLN-2 USB I2C adapter"
+       depends on MFD_DLN2
+       help
+        If you say yes to this option, support will be included for Diolan
+        DLN2, a USB to I2C interface.
+
+        This driver can also be built as a module.  If so, the module
+        will be called i2c-dln2.
+
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on PARPORT