Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index f6bf208f0fcaf22f18027903c4c604fe51269fd5..72fb9500f4101bcbaa36d1b2f5b9ede0fc84d9cc 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -449,6 +449,25 @@ config REGULATOR_PFUZE100
          Say y here to support the regulators found on the Freescale
          PFUZE100/PFUZE200 PMIC.
 
+config REGULATOR_PWM
+       tristate "PWM voltage regulator"
+       depends on PWM
+       help
+         This driver supports PWM controlled voltage regulators. PWM
+         duty cycle can increase or decrease the voltage.
+
+config REGULATOR_QCOM_RPM
+       tristate "Qualcomm RPM regulator driver"
+       depends on MFD_QCOM_RPM
+       help
+         If you say yes to this option, support will be included for the
+         regulators exposed by the Resource Power Manager found in Qualcomm
+         8660, 8960 and 8064 based devices.
+
+         Say M here if you want to include support for the regulators on the
+         Qualcomm RPM as a module. The module will be named
+         "qcom_rpm-regulator".
+
 config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
        depends on MFD_RC5T583
@@ -494,12 +513,6 @@ config REGULATOR_SKY81452
          This driver can also be built as a module. If so, the module
          will be called sky81452-regulator.
 
-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