Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 00676208080e6b63afcea9b58d2dedb5d6356b55..9f25b816e18e799b7ee105f5d96a7339afe83e9f 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -567,6 +567,16 @@ config REGULATOR_RK808
          through regulator interface. The device supports multiple DCDC/LDO
          outputs which can be controlled by i2c communication.
 
+config REGULATOR_RK818
+       tristate "Rockchip RK818 Power regulators"
+       depends on MFD_RK808
+       help
+         Select this option to enable the power regulator of ROCKCHIP
+         PMIC RK818.
+         This driver supports the control of different power rails of device
+         through regulator interface. The device supports multiple DCDC/LDO
+         outputs which can be controlled by i2c communication.
+
 config REGULATOR_RN5T618
        tristate "Ricoh RN5T618 voltage regulators"
        depends on MFD_RN5T618
@@ -616,6 +626,14 @@ config REGULATOR_SKY81452
          This driver can also be built as a module. If so, the module
          will be called sky81452-regulator.
 
+config REGULATOR_SYR82X
+       tristate "SYR82X DCDC SUPPORT REGULATOR"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Support the voltage and current regulators of the SYR82X
+         series of DCDC devices.
+
 config REGULATOR_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP