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

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index f0cc9e6dac3ac5a3ecd7cd78ea4dd38d5f72d41c..789eb46090e3ffe22de72845fe8edf8f32a907d3 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -139,6 +139,13 @@ config REGULATOR_AS3722
          AS3722 PMIC. This will enable support for all the software
          controllable DCDC/LDO regulators.
 
+config REGULATOR_AXP20X
+       tristate "X-POWERS AXP20X PMIC Regulators"
+       depends on MFD_AXP20X
+       help
+         This driver provides support for the voltage regulators on the
+         AXP20X PMIC.
+
 config REGULATOR_BCM590XX
        tristate "Broadcom BCM590xx PMU Regulators"
        depends on MFD_BCM590XX
@@ -265,6 +272,14 @@ config REGULATOR_LP8788
        help
          This driver supports LP8788 voltage regulator chip.
 
+config REGULATOR_LTC3589
+       tristate "LTC3589 8-output voltage regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This enables support for the LTC3589, LTC3589-1, and LTC3589-2
+         8-output regulators controlled via I2C.
+
 config REGULATOR_MAX14577
        tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577