Merge 5.12-rc6 into staging-next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c80ad73..f11c9f1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -300,7 +300,6 @@ M:  Syed Nayyar Waris <syednwaris@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
-F:     Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
 F:     drivers/counter/104-quad-8.c
 
 ACCES PCI-IDIO-16 GPIO DRIVER
@@ -7383,14 +7382,6 @@ F:       Documentation/hwmon/gsc-hwmon.rst
 F:     drivers/hwmon/gsc-hwmon.c
 F:     include/linux/platform_data/gsc_hwmon.h
 
-GASKET DRIVER FRAMEWORK
-M:     Rob Springer <rspringer@google.com>
-M:     Todd Poynor <toddpoynor@google.com>
-M:     Ben Chan <benchan@chromium.org>
-M:     Richard Yeh <rcy@google.com>
-S:     Maintained
-F:     drivers/staging/gasket/
-
 GCC PLUGINS
 M:     Kees Cook <keescook@chromium.org>
 L:     linux-hardening@vger.kernel.org
@@ -8691,10 +8682,15 @@ 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>
-R:     Peter Meerwald-Stadler <pmeerw@pmeerw.net>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
@@ -9289,6 +9285,13 @@ F:       include/dt-bindings/interconnect/
 F:     include/linux/interconnect-provider.h
 F:     include/linux/interconnect.h
 
+INTERRUPT COUNTER DRIVER
+M:     Oleksij Rempel <o.rempel@pengutronix.de>
+R:     Pengutronix Kernel Team <kernel@pengutronix.de>
+L:     linux-iio@vger.kernel.org
+F:     Documentation/devicetree/bindings/counter/interrupt-counter.yaml
+F:     drivers/counter/interrupt-cnt.c
+
 INVENSENSE ICM-426xx IMU DRIVER
 M:     Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
 L:     linux-iio@vger.kernel.org
@@ -17827,6 +17830,13 @@ M:     Robert Richter <rric@kernel.org>
 S:     Odd Fixes
 F:     drivers/gpio/gpio-thunderx.c
 
+TI ADS131E0X ADC SERIES DRIVER
+M:     Tomislav Denis <tomislav.denis@avl.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/adc/ti,ads131e08.yaml
+F:     drivers/iio/adc/ti-ads131e08.c
+
 TI AM437X VPFE DRIVER
 M:     "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 L:     linux-media@vger.kernel.org