Merge remote-tracking branches 'regulator/topic/max8973', 'regulator/topic/max8997...

[karo-tx-linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index a048d626843bc4176c3a38b57c3ce0c340c9cdf6..e5e4017b10112624582d61ef6aac4af608b03a84 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -139,6 +139,14 @@ config REGULATOR_AS3722
          AS3722 PMIC. This will enable support for all the software
          controllable DCDC/LDO regulators.
 
+config REGULATOR_BCM590XX
+       tristate "Broadcom BCM590xx PMU Regulators"
+       depends on MFD_BCM590XX
+       help
+         This driver provides support for the voltage regulators on the
+         BCM590xx PMUs. This will enable support for the software
+         controllable LDO/Switching regulators.
+
 config REGULATOR_DA903X
        tristate "Dialog Semiconductor DA9030/DA9034 regulators"
        depends on PMIC_DA903X
@@ -416,13 +424,21 @@ config REGULATOR_RC5T583
          through regulator interface. The device supports multiple DCDC/LDO
          outputs which can be controlled by i2c communication.
 
+config REGULATOR_S2MPA01
+       tristate "Samsung S2MPA01 voltage regulator"
+       depends on MFD_SEC_CORE
+       help
+        This driver controls Samsung S2MPA01 voltage output regulator
+        via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.
+
 config REGULATOR_S2MPS11
-       tristate "Samsung S2MPS11 voltage regulator"
+       tristate "Samsung S2MPS11/S2MPS14 voltage regulator"
        depends on MFD_SEC_CORE
        help
-        This driver supports a Samsung S2MPS11 voltage output regulator
-        via I2C bus. S2MPS11 is comprised of high efficient Buck converters
-        including Dual-Phase Buck converter, Buck-Boost converter, various LDOs.
+        This driver supports a Samsung S2MPS11/S2MPS14 voltage output
+        regulator via I2C bus. The chip is comprised of high efficient Buck
+        converters including Dual-Phase Buck converter, Buck-Boost converter,
+        various LDOs.
 
 config REGULATOR_S5M8767
        tristate "Samsung S5M8767A voltage regulator"