Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio',...

[~andy/linux] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index b4a445e7f78de6d9e921fd366a39d3f9192d7f85..77711d4bd3771cae693f89b154c4c8ebaff45f98 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -70,6 +70,14 @@ config REGULATOR_88PM8607
        help
          This driver supports 88PM8607 voltage regulator chips.
 
+config REGULATOR_ACT8865
+       tristate "Active-semi act8865 voltage regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This driver controls a active-semi act8865 voltage output
+         regulator via I2C bus.
+
 config REGULATOR_AD5398
        tristate "Analog Devices AD5398/AD5821 regulators"
        depends on I2C
@@ -249,6 +257,13 @@ config REGULATOR_LP8788
        help
          This driver supports LP8788 voltage regulator chip.
 
+config REGULATOR_MAX14577
+       tristate "Maxim 14577 regulator"
+       depends on MFD_MAX14577
+       help
+         This driver controls a Maxim 14577 regulator via I2C bus.
+         The regulators include safeout LDO and current regulator 'CHARGER'.
+
 config REGULATOR_MAX1586
        tristate "Maxim 1586/1587 voltage regulator"
        depends on I2C