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 /MAINTAINERS | |
| parent | c3d80522237b71480109fc397975fe4146ed2550 (diff) | |
| parent | 904ac71f4b0c1c26ec47ff597cb3d3c7d36e618d (diff) | |
| download | linux-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.tar.gz linux-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.tar.bz2 linux-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.zip | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index baa75a324cbd..ba4fe4651f75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11395,10 +11395,15 @@ F: kernel/module.c MONOLITHIC POWER SYSTEM PMIC DRIVER M: Saravanan Sekar <sravanhome@gmail.com> S: Maintained +F: Documentation/devicetree/bindings/mfd/mps,mp2629.yaml F: Documentation/devicetree/bindings/regulator/mps,mp*.yaml +F: drivers/iio/adc/mp2629_adc.c +F: drivers/mfd/mp2629.c +F: drivers/power/supply/mp2629_charger.c F: drivers/regulator/mp5416.c F: drivers/regulator/mpq7920.c F: drivers/regulator/mpq7920.h +F: include/linux/mfd/mp2629.h MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER S: Orphan |