Merge remote-tracking branches 'regulator/topic/const', 'regulator/topic/lm363x'...

[linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8df0b0e62976d460c96a0be4dffbe53363586b4a..263101994a69f119a1e47fda54ea163d841041b2 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -274,6 +274,15 @@ config REGULATOR_ISL6271A
        help
          This driver supports ISL6271A voltage regulator chip.
 
+config REGULATOR_LM363X
+       tristate "TI LM363X voltage regulators"
+       depends on MFD_TI_LMU
+       help
+         This driver supports LM3631 and LM3632 voltage regulators for
+         the LCD bias.
+         One boost output voltage is configurable and always on.
+         Other LDOs are used for the display module.
+
 config REGULATOR_LP3971
        tristate "National Semiconductors LP3971 PMIC regulator driver"
        depends on I2C
@@ -446,6 +455,7 @@ config REGULATOR_MC13892
 config REGULATOR_MT6311
        tristate "MediaTek MT6311 PMIC"
        depends on I2C
+       select REGMAP_I2C
        help
          Say y here to select this option to enable the power regulator of
          MediaTek MT6311 PMIC.