Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 6a7932822e373317caba9c5c799c9439f5444927..903eb37f047a916d510685b7e203a4ecdb680cbd 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
@@ -384,6 +392,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
@@ -399,12 +416,12 @@ config REGULATOR_PCF50633
         on PCF50633
 
 config REGULATOR_PFUZE100
-       tristate "Freescale PFUZE100 regulator driver"
+       tristate "Freescale PFUZE100/PFUZE200 regulator driver"
        depends on I2C
        select REGMAP_I2C
        help
-         Say y here to support the regulators found on the Freescale PFUZE100
-         PMIC.
+         Say y here to support the regulators found on the Freescale
+         PFUZE100/PFUZE200 PMIC.
 
 config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
@@ -416,13 +433,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"
@@ -432,6 +457,12 @@ config REGULATOR_S5M8767
         via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
         supports DVS mode with 8bits of output voltage control.
 
+config REGULATOR_ST_PWM
+       tristate "STMicroelectronics PWM voltage regulator"
+       depends on ARCH_STI
+       help
+        This driver supports ST's PWM controlled voltage regulators.
+
 config REGULATOR_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP
@@ -513,6 +544,15 @@ config REGULATOR_TPS65217
          voltage regulators. It supports software based voltage control
          for different voltage domains
 
+config REGULATOR_TPS65218
+       tristate "TI TPS65218 Power regulators"
+       depends on MFD_TPS65218 && OF
+       help
+         This driver supports TPS65218 voltage regulator chips. TPS65218
+         provides six step-down converters and one general-purpose LDO
+         voltage regulators. It supports software based voltage control
+         for different voltage domains
+
 config REGULATOR_TPS6524X
        tristate "TI TPS6524X Power regulators"
        depends on SPI