Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...

[pandora-kernel.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index e1d9436..de75f67 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -108,6 +108,15 @@ config REGULATOR_MAX8952
          via I2C bus. Maxim 8952 has one voltage output and supports 4 DVS
          modes ranging from 0.77V to 1.40V by 0.01V steps.
 
+config REGULATOR_MAX8997
+       tristate "Maxim 8997/8966 regulator"
+       depends on MFD_MAX8997
+       help
+         This driver controls a Maxim 8997/8966 regulator
+         via I2C bus. The provided regulator is suitable for S5PC110,
+         S5PV210, and Exynos-4 chips to control VCC_CORE and
+         VCC_USIM voltages.
+
 config REGULATOR_MAX8998
        tristate "Maxim 8998 voltage regulator"
        depends on MFD_MAX8998
@@ -214,6 +223,15 @@ config REGULATOR_AB3100
         AB3100 analog baseband dealing with power regulators
         for the system.
 
+config REGULATOR_TPS6105X
+       tristate "TI TPS6105X Power regulators"
+       depends on TPS6105X
+       default y if TPS6105X
+       help
+         This driver supports TPS61050/TPS61052 voltage regulator chips.
+         It is a single boost converter primarily for white LEDs and
+         audio amplifiers.
+
 config REGULATOR_TPS65023
        tristate "TI TPS65023 Power regulators"
        depends on I2C