Merge remote-tracking branches 'regulator/topic/mt6311', 'regulator/topic/ocp', ...

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index bef3bde6971b0425d2632b54d2f1bb447c643ce4..f3cdf7a4e4871dddade312b95456ec3814579d93 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -209,13 +209,13 @@ config REGULATOR_DA9210
          interface.
 
 config REGULATOR_DA9211
-       tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214 regulator"
+       tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 regulator"
        depends on I2C
        select REGMAP_I2C
        help
          Say y here to support for the Dialog Semiconductor DA9211/DA9212
-         /DA9213/DA9214.
-         The DA9211/DA9212/DA9213/DA9214 is a multi-phase synchronous
+         /DA9213/DA9214/DA9215.
+         The DA9211/DA9212/DA9213/DA9214/DA9215 is a multi-phase synchronous
          step down converter 12A or 16A DC-DC Buck controlled through an I2C
          interface.
 
@@ -407,13 +407,13 @@ config REGULATOR_MAX77686
          Exynos-4 chips to control VARM and VINT voltages.
 
 config REGULATOR_MAX77693
-       tristate "Maxim MAX77693 regulator"
-       depends on MFD_MAX77693
+       tristate "Maxim 77693/77843 regulator"
+       depends on (MFD_MAX77693 || MFD_MAX77843)
        help
-         This driver controls a Maxim 77693 regulator via I2C bus.
+         This driver controls a Maxim 77693/77843 regulators via I2C bus.
          The regulators include two LDOs, 'SAFEOUT1', 'SAFEOUT2'
          and one current regulator 'CHARGER'. This is suitable for
-         Exynos-4x12 chips.
+         Exynos-4x12 (MAX77693) or Exynos5433 (MAX77843) SoC chips.
 
 config REGULATOR_MAX77802
        tristate "Maxim 77802 regulator"
@@ -424,14 +424,6 @@ config REGULATOR_MAX77802
          Exynos5420/Exynos5800 SoCs to control various voltages.
          It includes support for control of voltage and ramp speed.
 
-config REGULATOR_MAX77843
-       tristate "Maxim 77843 regulator"
-       depends on MFD_MAX77843
-       help
-         This driver controls a Maxim 77843 regulator.
-         The regulator include two 'SAFEOUT' for USB(Universal Serial Bus)
-         This is suitable for Exynos5433 SoC chips.
-
 config REGULATOR_MC13XXX_CORE
        tristate
 
@@ -451,6 +443,15 @@ config REGULATOR_MC13892
          Say y here to support the regulators found on the Freescale MC13892
          PMIC.
 
+config REGULATOR_MT6311
+       tristate "MediaTek MT6311 PMIC"
+       depends on I2C
+       help
+         Say y here to select this option to enable the power regulator of
+         MediaTek MT6311 PMIC.
+         This driver supports the control of different power rails of device
+         through regulator interface.
+
 config REGULATOR_MT6397
        tristate "MediaTek MT6397 PMIC"
        depends on MFD_MT6397