Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 6c88e31..936f7cc 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -323,7 +323,7 @@ config REGULATOR_LP872X
 
 config REGULATOR_LP873X
        tristate "TI LP873X Power regulators"
-       depends on MFD_LP873X && OF
+       depends on MFD_TI_LP873X && OF
        help
          This driver supports LP873X voltage regulator chips. LP873X
          provides two step-down converters and two general-purpose LDO
@@ -353,6 +353,14 @@ config REGULATOR_LTC3589
          This enables support for the LTC3589, LTC3589-1, and LTC3589-2
          8-output regulators controlled via I2C.
 
+config REGULATOR_LTC3676
+       tristate "LTC3676 8-output voltage regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This enables support for the LTC3676
+         8-output regulators controlled via I2C.
+
 config REGULATOR_MAX14577
        tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577
@@ -635,11 +643,11 @@ config REGULATOR_RC5T583
          outputs which can be controlled by i2c communication.
 
 config REGULATOR_RK808
-       tristate "Rockchip RK808 Power regulators"
+       tristate "Rockchip RK808/RK818 Power regulators"
        depends on MFD_RK808
        help
          Select this option to enable the power regulator of ROCKCHIP
-         PMIC RK808.
+         PMIC RK808 and 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.
@@ -820,7 +828,7 @@ config REGULATOR_TPS65912
            This driver supports TPS65912 voltage regulator chip.
 
 config REGULATOR_TPS80031
-       tristate "TI TPS80031/TPS80032 power regualtor driver"
+       tristate "TI TPS80031/TPS80032 power regulator driver"
        depends on MFD_TPS80031
        help
          TPS80031/ TPS80032 Fully Integrated Power Management with Power