diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-28 11:17:00 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-28 11:17:00 (GMT) |
commit | fdaff15ae6cc8745b9b56adab0252729b476ed7e (patch) | |
tree | 182eb140d5c71501159fb0d46ffc8b74c766dc13 /drivers/regulator/Kconfig | |
parent | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 (diff) | |
parent | 9839d627c2a2c74facde9a9ee949f2ba0a1363b1 (diff) | |
download | linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.xz |
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
Diffstat (limited to 'drivers/regulator/Kconfig')
-rw-r--r-- | drivers/regulator/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index c3ca05c..72fb950 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -502,6 +502,17 @@ 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_SKY81452 + tristate "Skyworks Solutions SKY81452 voltage regulator" + depends on SKY81452 + help + This driver supports Skyworks SKY81452 voltage output regulator + via I2C bus. SKY81452 has one voltage linear regulator can be + programmed from 4.5V to 20V. + + This driver can also be built as a module. If so, the module + will be called sky81452-regulator. + config REGULATOR_TI_ABB tristate "TI Adaptive Body Bias on-chip LDO" depends on ARCH_OMAP |