Merge tag 'driver-core-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 144cbadc7c728d38661cd231f704751cce6b0227..65fa29591d21641fd1bd4e4484d8daeef56f9bdb 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -129,6 +129,8 @@ config I2C_I801
            Broxton (SOC)
            Lewisburg (PCH)
            Gemini Lake (SOC)
+           Cannon Lake-H (PCH)
+           Cannon Lake-LP (PCH)
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -326,6 +328,16 @@ config I2C_POWERMAC
 
 comment "I2C system bus drivers (mostly embedded / system-on-chip)"
 
+config I2C_ASPEED
+       tristate "Aspeed I2C Controller"
+       depends on ARCH_ASPEED || COMPILE_TEST
+       help
+         If you say yes to this option, support will be included for the
+         Aspeed I2C controller.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-aspeed.
+
 config I2C_AT91
        tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
        depends on ARCH_AT91
@@ -474,11 +486,22 @@ config I2C_DESIGNWARE_PLATFORM
        depends on (ACPI && COMMON_CLK) || !ACPI
        help
          If you say yes to this option, support will be included for the
-         Synopsys DesignWare I2C adapter. Only master mode is supported.
+         Synopsys DesignWare I2C adapter.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-designware-platform.
 
+config I2C_DESIGNWARE_SLAVE
+       bool "Synopsys DesignWare Slave"
+       select I2C_SLAVE
+       depends on I2C_DESIGNWARE_PLATFORM
+       help
+         If you say yes to this option, support will be included for the
+         Synopsys DesignWare I2C slave adapter.
+
+         This is not a standalone module, this module compiles together with
+         i2c-designware-core.
+
 config I2C_DESIGNWARE_PCI
        tristate "Synopsys DesignWare PCI"
        depends on PCI
@@ -960,7 +983,7 @@ config I2C_UNIPHIER_F
 
 config I2C_VERSATILE
        tristate "ARM Versatile/Realview I2C bus support"
-       depends on ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS || COMPILE_TEST
+       depends on ARCH_MPS2 || ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS || COMPILE_TEST
        select I2C_ALGOBIT
        help
          Say yes if you want to support the I2C serial bus on ARMs Versatile
@@ -1258,4 +1281,13 @@ config I2C_OPAL
          This driver can also be built as a module. If so, the module will be
          called as i2c-opal.
 
+config I2C_ZX2967
+       tristate "ZTE ZX2967 I2C support"
+       depends on ARCH_ZX
+       default y
+       help
+         Selecting this option will add ZX2967 I2C driver.
+         This driver can also be built as a module. If so, the module will be
+         called i2c-zx2967.
+
 endmenu