Merge tag 'regulator-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-block.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8553bdf87c1d617919e53c759a122158d35345b1..7928960563e6a83f46cf3155ee80c24ce320edbb 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -136,19 +136,20 @@ config REGULATOR_AB8500
          signal AB8500 PMIC
 
 config REGULATOR_ARIZONA_LDO1
-       tristate "Wolfson Arizona class devices LDO1"
-       depends on MFD_ARIZONA
+       tristate "Cirrus Madera and Wolfson Arizona class devices LDO1"
+       depends on MFD_ARIZONA || MFD_MADERA
        depends on SND_SOC
        help
-         Support for the LDO1 regulators found on Wolfson Arizona class
-         devices.
+         Support for the LDO1 regulators found on Cirrus Logic Madera codecs
+         and Wolfson Microelectronic Arizona codecs.
 
 config REGULATOR_ARIZONA_MICSUPP
-       tristate "Wolfson Arizona class devices MICSUPP"
-       depends on MFD_ARIZONA
+       tristate "Cirrus Madera and Wolfson Arizona class devices MICSUPP"
+       depends on MFD_ARIZONA || MFD_MADERA
        depends on SND_SOC
        help
-         Support for the MICSUPP regulators found on Wolfson Arizona class
+         Support for the MICSUPP regulators found on Cirrus Logic Madera codecs
+         and Wolfson Microelectronic Arizona codecs
          devices.
 
 config REGULATOR_AS3711
@@ -258,7 +259,7 @@ config REGULATOR_DA9062
 
 config REGULATOR_DA9063
        tristate "Dialog Semiconductor DA9063 regulators"
-       depends on MFD_DA9063
+       depends on MFD_DA9063 && OF
        help
          Say y here to support the BUCKs and LDOs regulators found on
          DA9063 PMICs.
@@ -364,7 +365,7 @@ config REGULATOR_LM363X
        tristate "TI LM363X voltage regulators"
        depends on MFD_TI_LMU
        help
-         This driver supports LM3631 and LM3632 voltage regulators for
+         This driver supports LM3631, LM3632 and LM36274 voltage regulators for
          the LCD bias.
          One boost output voltage is configurable and always on.
          Other LDOs are used for the display module.
@@ -829,6 +830,26 @@ config REGULATOR_SKY81452
          This driver can also be built as a module. If so, the module
          will be called sky81452-regulator.
 
+config REGULATOR_SLG51000
+        tristate "Dialog Semiconductor SLG51000 regulators"
+        depends on I2C
+        select REGMAP_I2C
+        help
+         Say y here to support for the Dialog Semiconductor SLG51000.
+         The SLG51000 is seven compact and customizable low dropout
+         regulators.
+
+config REGULATOR_STM32_BOOSTER
+       tristate "STMicroelectronics STM32 BOOSTER"
+       depends on ARCH_STM32 || COMPILE_TEST
+       help
+         This driver supports internal booster (3V3) embedded in some
+         STMicroelectronics STM32 chips. It can be used to supply ADC analog
+         input switches when vdda supply is below 2.7V.
+
+         This driver can also be built as a module. If so, the module
+         will be called stm32-booster.
+
 config REGULATOR_STM32_VREFBUF
        tristate "STMicroelectronics STM32 VREFBUF"
        depends on ARCH_STM32 || COMPILE_TEST