diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-28 12:14:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-28 12:14:26 +0100 |
| commit | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 (patch) | |
| tree | 30f11b3581cdab9f344bd6718a73988e7fc6a59c /drivers/regulator/Kconfig | |
| parent | 6a642509801116037720892efe72f0e84f02f317 (diff) | |
| parent | fbf7974427910a3f13fcb76a3493f9da0b141120 (diff) | |
| download | linux-stable-d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3.tar.gz linux-stable-d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3.tar.bz2 linux-stable-d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3.zip | |
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
Diffstat (limited to 'drivers/regulator/Kconfig')
| -rw-r--r-- | drivers/regulator/Kconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 0e59754d8df2..c3ca05cb5c87 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -449,6 +449,13 @@ 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 @@ -495,12 +502,6 @@ 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 |