Merge tag 'sound-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f49f404c2004a108d7c2c909e44acba28e339149..d5ad04dad081df4e78418a6bb19c9ab6997d2e3f 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -283,6 +283,18 @@ config HTC_I2CPLD
          This device provides input and output GPIOs through an I2C
          interface to one or more sub-chips.
 
+config MFD_INTEL_QUARK_I2C_GPIO
+       tristate "Intel Quark MFD I2C GPIO"
+       depends on PCI
+       depends on X86
+       depends on COMMON_CLK
+       select MFD_CORE
+       help
+         This MFD provides support for I2C and GPIO that exist only
+         in a single PCI device. It splits the 2 IO devices to
+         their respective IO driver.
+         The GPIO exports a total amount of 8 interrupt-capable GPIOs.
+
 config LPC_ICH
        tristate "Intel ICH LPC"
        depends on PCI
@@ -779,6 +791,18 @@ config MFD_SM501_GPIO
         lines on the SM501. The platform data is used to supply the
         base number for the first GPIO line to register.
 
+config MFD_SKY81452
+       tristate "Skyworks Solutions SKY81452"
+       select MFD_CORE
+       select REGMAP_I2C
+       depends on I2C
+       help
+         This is the core driver for the Skyworks SKY81452 backlight and
+         voltage regulator device.
+
+         This driver can also be built as a module.  If so, the module
+         will be called sky81452.
+
 config MFD_SMSC
        bool "SMSC ECE1099 series chips"
        depends on I2C=y
@@ -1236,6 +1260,7 @@ config MFD_TIMBERDALE
 config MFD_TC3589X
        bool "Toshiba TC35892 and variants"
        depends on I2C=y
+       depends on OF
        select MFD_CORE
        help
          Support for the Toshiba TC35892 and variants I/O Expander.
@@ -1389,7 +1414,7 @@ config MFD_WM8994
        depends on I2C
        help
          The WM8994 is a highly integrated hi-fi CODEC designed for
-         smartphone applicatiosn.  As well as audio functionality it
+         smartphone applications.  As well as audio functionality it
          has on board GPIO and regulator functionality which is
          supported via the relevant subsystems.  This driver provides
          core support for the WM8994, in order to use the actual