Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...

[karo-tx-linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8155e80dd3f8cb1af05636eb07af16e799566127..39b422b97ec00267d794909cf5724e1ce5b1fc58 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -78,6 +78,15 @@ config REGULATOR_ACT8865
          This driver controls a active-semi act8865 voltage output
          regulator via I2C bus.
 
+config REGULATOR_ACT8945A
+       tristate "Active-semi ACT8945A voltage regulator"
+       depends on MFD_ACT8945A
+       help
+         This driver controls a active-semi ACT8945A voltage regulator
+         via I2C bus. The ACT8945A features three step-down DC/DC converters
+         and four low-dropout linear regulators, along with a ActivePath
+         battery charger.
+
 config REGULATOR_AD5398
        tristate "Analog Devices AD5398/AD5821 regulators"
        depends on I2C
@@ -261,6 +270,14 @@ config REGULATOR_HI6421
          21 general purpose LDOs, 3 dedicated LDOs, and 5 BUCKs. All
          of them come with support to either ECO (idle) or sleep mode.
 
+config REGULATOR_HI655X
+       tristate "Hisilicon HI655X PMIC regulators support"
+       depends on ARCH_HISI || COMPILE_TEST
+       depends on MFD_HI655X_PMIC && OF
+       help
+         This driver provides support for the voltage regulators of the
+         Hisilicon Hi655x PMIC device.
+
 config REGULATOR_ISL9305
        tristate "Intersil ISL9305 regulator"
        depends on I2C