Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next

[mirror_ubuntu-artful-kernel.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index be06eb29c6817bd30f5747384e2da7432f87644c..48db87d6dfef4d0bc6f2037feeab7cf88c7949c5 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -125,12 +125,20 @@ config REGULATOR_AB8500
          This driver supports the regulators found on the ST-Ericsson mixed
          signal AB8500 PMIC
 
-config REGULATOR_ARIZONA
-       tristate "Wolfson Arizona class devices"
+config REGULATOR_ARIZONA_LDO1
+       tristate "Wolfson Arizona class devices LDO1"
        depends on MFD_ARIZONA
        depends on SND_SOC
        help
-         Support for the regulators found on Wolfson Arizona class
+         Support for the LDO1 regulators found on Wolfson Arizona class
+         devices.
+
+config REGULATOR_ARIZONA_MICSUPP
+       tristate "Wolfson Arizona class devices MICSUPP"
+       depends on MFD_ARIZONA
+       depends on SND_SOC
+       help
+         Support for the MICSUPP regulators found on Wolfson Arizona class
          devices.
 
 config REGULATOR_AS3711
@@ -163,6 +171,17 @@ config REGULATOR_BCM590XX
          BCM590xx PMUs. This will enable support for the software
          controllable LDO/Switching regulators.
 
+config REGULATOR_BD9571MWV
+       tristate "ROHM BD9571MWV Regulators"
+       depends on MFD_BD9571MWV
+       help
+         This driver provides support for the voltage regulators on the
+         ROHM BD9571MWV PMIC. This will enable support for the software
+         controllable regulator and voltage sampling units.
+
+         This driver can also be built as a module. If so, the module
+         will be called bd9571mwv-regulator.
+
 config REGULATOR_CPCAP
        tristate "Motorola CPCAP regulator"
        depends on MFD_CPCAP
@@ -788,6 +807,14 @@ config REGULATOR_TPS65090
          This driver provides support for the voltage regulators on the
          TI TPS65090 PMIC.
 
+config REGULATOR_TPS65132
+       tristate "TI TPS65132 Dual Output Power regulators"
+       depends on I2C && GPIOLIB
+       select REGMAP_I2C
+       help
+         This driver supports TPS65132 single inductor - dual output
+         power supply specifcally designed for display panels.
+
 config REGULATOR_TPS65217
        tristate "TI TPS65217 Power regulators"
        depends on MFD_TPS65217
@@ -850,6 +877,13 @@ config REGULATOR_TWL4030
          This driver supports the voltage regulators provided by
          this family of companion chips.
 
+config REGULATOR_VCTRL
+       tristate "Voltage controlled regulators"
+       depends on OF
+       help
+         This driver provides support for voltage regulators whose output
+         voltage is controlled by the voltage of another regulator.
+
 config REGULATOR_VEXPRESS
        tristate "Versatile Express regulators"
        depends on VEXPRESS_CONFIG