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

[pandora-kernel.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8bb2644..f1e6ad9 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -250,6 +250,15 @@ config REGULATOR_MAX77686
          via I2C bus. The provided regulator is suitable for
          Exynos-4 chips to control VARM and VINT voltages.
 
+config REGULATOR_MAX77693
+       tristate "Maxim MAX77693 regulator"
+       depends on MFD_MAX77693
+       help
+         This driver controls a Maxim 77693 regulator via I2C bus.
+         The regulators include two LDOs, 'SAFEOUT1', 'SAFEOUT2'
+         and one current regulator 'CHARGER'. This is suitable for
+         Exynos-4x12 chips.
+
 config REGULATOR_PCAP
        tristate "Motorola PCAP2 regulator driver"
        depends on EZX_PCAP
@@ -472,6 +481,16 @@ config REGULATOR_TWL4030
          This driver supports the voltage regulators provided by
          this family of companion chips.
 
+config REGULATOR_TI_ABB
+       bool "TI Adaptive Body Bias on-chip LDO"
+       depends on ARCH_OMAP
+       help
+         Select this option to support Texas Instruments' on-chip Adaptive Body
+         Bias (ABB) LDO regulators. It is recommended that this option be
+         enabled on required TI SoC. Certain Operating Performance Points
+         on TI SoCs may be unstable without enabling this as it provides
+         device specific optimized bias to allow/optimize functionality.
+
 config REGULATOR_VEXPRESS
        tristate "Versatile Express regulators"
        depends on VEXPRESS_CONFIG