Merge tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7a9804a891fdc68cb5f8c75663786d5d6577d9b9..67e448eab2763ba9794f9355816a45af1fc1d9b2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2353,7 +2353,7 @@ F:        drivers/pinctrl/zte/
 F:     drivers/soc/zte/
 F:     drivers/thermal/zx2967_thermal.c
 F:     drivers/watchdog/zx2967_wdt.c
-F:     Documentation/devicetree/bindings/arm/zte.txt
+F:     Documentation/devicetree/bindings/arm/zte.yaml
 F:     Documentation/devicetree/bindings/clock/zx2967*.txt
 F:     Documentation/devicetree/bindings/dma/zxdma.txt
 F:     Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
@@ -3688,6 +3688,8 @@ F:        drivers/net/ethernet/cisco/enic/
 
 CISCO VIC LOW LATENCY NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
+M:     Nelson Escobar <neescoba@cisco.com>
+M:     Parvi Kaustubhi <pkaustub@cisco.com>
 S:     Supported
 F:     drivers/infiniband/hw/usnic/
 
@@ -6410,7 +6412,6 @@ F:        drivers/media/rc/gpio-ir-tx.c
 
 GPIO MOCKUP DRIVER
 M:     Bamvor Jian Zhang <bamv2005@gmail.com>
-R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-mockup.c
@@ -9931,6 +9932,12 @@ M:       Nicolas Ferre <nicolas.ferre@microchip.com>
 S:     Supported
 F:     drivers/power/reset/at91-sama5d2_shdwc.c
 
+MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
+M:     Andrei Stefanescu <andrei.stefanescu@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-gpio@vger.kernel.org
+F:     drivers/gpio/gpio-sama5d2-piobu.c
+
 MICROCHIP SPI DRIVER
 M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 S:     Supported