diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:05 +0100 |
commit | 28120bf84929167d2a712f037a960add5e1584f5 (patch) | |
tree | 128be30ea8d01d7dcc1afa8b940a7d1242fb736c /drivers/regulator/Kconfig | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
parent | 8c7e7ddf31ca9943b70e58d1c47d059beda435bd (diff) |
Merge remote-tracking branch 'regulator/fix/max77693' into regulator-linus
Diffstat (limited to 'drivers/regulator/Kconfig')
-rw-r--r-- | drivers/regulator/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 8bb26446037..9744437afe3 100644 --- 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 |