Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus

[linux-2.6-microblaze.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 5abdd29..77c4313 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -122,15 +122,6 @@ config REGULATOR_AAT2870
          If you have a AnalogicTech AAT2870 say Y to enable the
          regulator driver.
 
-config REGULATOR_AB3100
-       tristate "ST-Ericsson AB3100 Regulator functions"
-       depends on AB3100_CORE
-       default y if AB3100_CORE
-       help
-        These regulators correspond to functionality in the
-        AB3100 analog baseband dealing with power regulators
-        for the system.
-
 config REGULATOR_AB8500
        bool "ST-Ericsson AB8500 Power Regulators"
        depends on AB8500_CORE
@@ -179,6 +170,14 @@ config REGULATOR_AS3722
          AS3722 PMIC. This will enable support for all the software
          controllable DCDC/LDO regulators.
 
+config REGULATOR_ATC260X
+       tristate "Actions Semi ATC260x PMIC Regulators"
+       depends on MFD_ATC260X
+       help
+         This driver provides support for the voltage regulators on the
+         ATC260x PMICs. 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
@@ -732,6 +731,16 @@ config REGULATOR_MT6311
          This driver supports the control of different power rails of device
          through regulator interface.
 
+config REGULATOR_MT6315
+       tristate "MediaTek MT6315 PMIC"
+       depends on SPMI
+       select REGMAP_SPMI
+       help
+         Say y here to select this option to enable the power regulator of
+         MediaTek MT6315 PMIC.
+         This driver supports the control of different power rails of device
+         through regulator interface.
+
 config REGULATOR_MT6323
        tristate "MediaTek MT6323 PMIC"
        depends on MFD_MT6397
@@ -777,6 +786,16 @@ config REGULATOR_MT6397
          This driver supports the control of different power rails of device
          through regulator interface.
 
+config REGULATOR_MTK_DVFSRC
+       tristate "MediaTek DVFSRC regulator driver"
+       depends on MTK_DVFSRC
+       help
+         Say y here to control regulator by DVFSRC (dynamic voltage
+         and frequency scaling resource collector).
+         This driver supports to control regulators via the DVFSRC
+         of Mediatek. It allows for voting on regulator state
+         between multiple users.
+
 config REGULATOR_PALMAS
        tristate "TI Palmas PMIC Regulators"
        depends on MFD_PALMAS
@@ -828,6 +847,10 @@ config REGULATOR_PF8X00
          Say y here to support the regulators found on the NXP
          PF8100/PF8121A/PF8200 PMIC.
 
+         Say M here if you want to support for the regulators found
+         on the NXP PF8100/PF8121A/PF8200 PMIC. The module will be named
+         "pf8x00-regulator".
+
 config REGULATOR_PFUZE100
        tristate "Freescale PFUZE100/200/3000/3001 regulator driver"
        depends on I2C && OF
@@ -969,6 +992,16 @@ config REGULATOR_RT4801
          This adds support for voltage regulators in Richtek RT4801 Display Bias IC.
          The device supports two regulators (DSVP/DSVN).
 
+config REGULATOR_RT4831
+       tristate "Richtek RT4831 DSV Regulators"
+       depends on MFD_RT4831
+       help
+         This adds support for voltage regulators in Richtek RT4831.
+         There are three regulators (VLCM/DSVP/DSVN).
+         VLCM is a virtual voltage input for DSVP/DSVN inside IC.
+         And DSVP/DSVN is the real Vout range from 4V to 6.5V.
+         It's common used to provide the power for the display panel.
+
 config REGULATOR_RT5033
        tristate "Richtek RT5033 Regulators"
        depends on MFD_RT5033