Merge remote-tracking branches 'regulator/topic/lp872x', 'regulator/topic/ltc3589...

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 23496da101de12850ad323ae629fc58de90cf14a..a7b81f0185b56c6c7a428bc32eebda3612c4600c 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -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