Merge remote-tracking branches 'regulator/topic/fixed', 'regulator/topic/id-const...

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 5599a61bd88c0a5ebb4694c12849b7d7dcb12de9..c2fa0b4367b12bafbe820d2fade86af5658196c3 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
@@ -266,7 +273,9 @@ config REGULATOR_LP8788
          This driver supports LP8788 voltage regulator chip.
 
 config REGULATOR_LTC3589
-       bool "LTC3589 8-output voltage regulator"
+       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.