Merge tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 74a6354eaefa1718f74b1fa7e934bda0b14b14d0..c77dc08b1202c1077c72e082deadee3f2f9782d5 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -270,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
@@ -352,6 +360,15 @@ config REGULATOR_MAX1586
          regulator via I2C bus. The provided regulator is suitable
          for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
 
+config REGULATOR_MAX77620
+       tristate "Maxim 77620/MAX20024 voltage regulator"
+       depends on MFD_MAX77620
+       help
+         This driver controls Maxim MAX77620 voltage output regulator
+         via I2C bus. The provided regulator is suitable for Tegra
+         chip to control Step-Down DC-DC and LDOs. Say Y here to
+         enable the regulator driver.
+
 config REGULATOR_MAX8649
        tristate "Maxim 8649 voltage regulator"
        depends on I2C
@@ -771,7 +788,7 @@ config REGULATOR_TPS65910
 
 config REGULATOR_TPS65912
        tristate "TI TPS65912 Power regulator"
-       depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI)
+       depends on MFD_TPS65912
        help
            This driver supports TPS65912 voltage regulator chip.