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 1cd8584a7b887ffd9fd8fd0089c8148dba595064..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
@@ -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 regulator"
        depends on MFD_MAX14577
@@ -392,6 +407,15 @@ config REGULATOR_PALMAS
          on the muxing. This is handled automatically in the driver by
          reading the mux info from OTP.
 
+config REGULATOR_PBIAS
+       tristate "PBIAS OMAP regulator driver"
+       depends on (ARCH_OMAP || COMPILE_TEST) && MFD_SYSCON
+       help
+        Say y here to support pbias regulator for mmc1:SD card i/o
+        on OMAP SoCs.
+        This driver provides support for OMAP pbias modelled
+        regulators.
+
 config REGULATOR_PCAP
        tristate "Motorola PCAP2 regulator driver"
        depends on EZX_PCAP