Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd...

[cascardo/linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 5433c44..3904dc0 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.
@@ -696,6 +706,13 @@ config REGULATOR_TPS6507X
          three step-down converters and two general-purpose LDO voltage regulators.
          It supports TI's software based Class-2 SmartReflex implementation.
 
+config REGULATOR_TPS65086
+       tristate "TI TPS65086 Power regulators"
+       depends on MFD_TPS65086
+       help
+         This driver provides support for the voltage regulators on
+         TI TPS65086 PMICs.
+
 config REGULATOR_TPS65090
        tristate "TI TPS65090 Power regulator"
        depends on MFD_TPS65090