diff options
author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-03-26 10:03:41 +0000 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-03-26 10:23:46 +0000 |
commit | 1b33dfa5d5f165782a1cb18ba1350a42d5d7a579 (patch) | |
tree | 64577bf3843464f70e938019c90ddccf313b7934 /MAINTAINERS | |
parent | 24b84444eb6f8d6a5090f6fdf172cacfa43f89e9 (diff) | |
parent | f774117c96f94c7c4d2f076e4cacc80218b0df48 (diff) | |
download | linux-1b33dfa5d5f165782a1cb18ba1350a42d5d7a579.tar.gz linux-1b33dfa5d5f165782a1cb18ba1350a42d5d7a579.tar.bz2 linux-1b33dfa5d5f165782a1cb18ba1350a42d5d7a579.zip |
Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg
Updated to use devm_iio_kfifo_buffer_setup() in place of now
removed devm_iio_kfifo_allocate()
Take3 branch because first 2 versions including wrong version of
patch.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 57638f0d7cd2..9a9bf18bba00 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8691,6 +8691,12 @@ S: Maintained F: Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt F: drivers/iio/multiplexer/iio-mux.c +IIO SCMI BASED DRIVER +M: Jyoti Bhayana <jbhayana@google.com> +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/common/scmi_sensors/scmi_iio.c + IIO SUBSYSTEM AND DRIVERS M: Jonathan Cameron <jic23@kernel.org> R: Lars-Peter Clausen <lars@metafoo.de> |