Merge branch 'sh/pci-express-integration'

[karo-tx-linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d59334f34bf60e1806caf22324936fe9c35e2a19..db51ea1c608250be267a6430c6d808a77530e48d 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -186,6 +186,15 @@ config TWL4030_CODEC
        select MFD_CORE
        default n
 
+config TWL6030_PWM
+       tristate "TWL6030 PWM (Pulse Width Modulator) Support"
+       depends on TWL4030_CORE
+       select HAVE_PWM
+       default n
+       help
+         Say yes here if you want support for TWL6030 PWM.
+         This is used to control charging LED brightness.
+
 config MFD_STMPE
        bool "Support STMicroelectronics STMPE"
        depends on I2C=y && GENERIC_HARDIRQS
@@ -284,6 +293,16 @@ config MFD_MAX8925
          accessing the device, additional drivers must be enabled in order
          to use the functionality of the device.
 
+config MFD_MAX8998
+       bool "Maxim Semiconductor MAX8998 PMIC Support"
+       depends on I2C=y
+       select MFD_CORE
+       help
+         Say yes here to support for Maxim Semiconductor MAX8998. This is
+         a Power Management IC. This driver provies common support for
+         accessing the device, additional drivers must be enabled in order
+         to use the functionality of the device.
+
 config MFD_WM8400
        tristate "Support Wolfson Microelectronics WM8400"
        select MFD_CORE
@@ -522,6 +541,20 @@ config MFD_JZ4740_ADC
          Say yes here if you want support for the ADC unit in the JZ4740 SoC.
          This driver is necessary for jz4740-battery and jz4740-hwmon driver.
 
+config MFD_TPS6586X
+       tristate "TPS6586x Power Management chips"
+       depends on I2C && GPIOLIB
+       select MFD_CORE
+       help
+         If you say yes here you get support for the TPS6586X series of
+         Power Management chips.
+         This driver provides common support for accessing the device,
+         additional drivers must be enabled in order to use the
+         functionality of the device.
+
+         This driver can also be built as a module.  If so, the module
+         will be called tps6586x.
+
 endif # MFD_SUPPORT
 
 menu "Multimedia Capabilities Port drivers"