Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 37f697dc4b4c2ed0316f9410051e28a6934f6665..6845d7439c2322c31e037e8972c7a866e29bbce4 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -64,6 +64,16 @@ config REGULATOR_USERSPACE_CONSUMER
 
          If unsure, say no.
 
+config REGULATOR_88PM800
+       tristate "Marvell 88PM800 Power regulators"
+       depends on MFD_88PM800
+       help
+         This driver supports Marvell 88PM800 voltage regulator chips.
+         It delivers digitally programmable output,
+         the voltage is programmed via I2C interface.
+         It's suitable to support PXA988 chips to control VCC_MAIN and
+         various voltages.
+
 config REGULATOR_88PM8607
        tristate "Marvell 88PM8607 Power regulators"
        depends on MFD_88PM860X=y
@@ -147,6 +157,26 @@ config REGULATOR_DA9055
          This driver can also be built as a module. If so, the module
          will be called da9055-regulator.
 
+config REGULATOR_DA9063
+       tristate "Dialog Semiconductor DA9063 regulators"
+       depends on MFD_DA9063
+       help
+         Say y here to support the BUCKs and LDOs regulators found on
+         DA9063 PMICs.
+
+         This driver can also be built as a module. If so, the module
+         will be called da9063-regulator.
+
+config REGULATOR_DA9210
+       tristate "Dialog Semiconductor DA9210 regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Say y here to support for the Dialog Semiconductor DA9210.
+         The DA9210 is a multi-phase synchronous step down
+         converter 12A DC-DC Buck controlled through an I2C
+         interface.
+
 config REGULATOR_DBX500_PRCMU
        bool