diff options
author | Sebastian Reichel <sre@kernel.org> | 2020-05-28 09:04:26 +0200 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2020-05-28 09:04:26 +0200 |
commit | 6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9 (patch) | |
tree | 1d686ed8397fecd27c7ced47078945c2af3c5893 /drivers/power/supply/Kconfig | |
parent | c3d80522237b71480109fc397975fe4146ed2550 (diff) | |
parent | 904ac71f4b0c1c26ec47ff597cb3d3c7d36e618d (diff) | |
download | linux-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.tar.bz2 |
Merge tag 'tags/ib-mfd-iio-power-v5.8' into psy-next
This merges the MP2629 battery charge management immutable branch
between MFD, IIO and power-supply due for the v5.8 merge window
into power-supply for-next branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply/Kconfig')
-rw-r--r-- | drivers/power/supply/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 81b567ee1638..44d3c8512fb8 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -552,6 +552,16 @@ config CHARGER_MAX8998 Say Y to enable support for the battery charger control sysfs and platform data of MAX8998/LP3974 PMICs. +config CHARGER_MP2629 + tristate "Monolithic power system MP2629 Battery charger" + depends on MFD_MP2629 + depends on MP2629_ADC + depends on IIO + help + Select this option to enable support for Monolithic power system + Battery charger. This driver provides Battery charger power management + functions on the systems. + config CHARGER_QCOM_SMBB tristate "Qualcomm Switch-Mode Battery Charger and Boost" depends on MFD_SPMI_PMIC || COMPILE_TEST |