Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona...

[sfrench/cifs-2.6.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 936f7ccc9736f8c550f712f6cb9fd8c8622ce29c..9ecd70373f0bd2231da7041d797ee4a62367fc8f 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,24 @@ 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
+       help
+         Say y here for CPCAP regulator found on some Motorola phones
+         and tablets such as Droid 4.
+
 config REGULATOR_DA903X
        tristate "Dialog Semiconductor DA9030/DA9034 regulators"
        depends on PMIC_DA903X