Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 28d7acd..9d7784a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2146,8 +2146,10 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://linux-chenxing.org/
 F:     Documentation/devicetree/bindings/arm/mstar/*
+F:     Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
 F:     arch/arm/boot/dts/mstar-*
 F:     arch/arm/mach-mstar/
+F:     drivers/gpio/gpio-msc313.c
 F:     include/dt-bindings/gpio/msc313-gpio.h
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
@@ -7548,6 +7550,7 @@ M:        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 L:     linux-gpio@vger.kernel.org
 L:     linux-acpi@vger.kernel.org
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     Documentation/firmware-guide/acpi/gpio-properties.rst
 F:     drivers/gpio/gpiolib-acpi.c
 F:     drivers/gpio/gpiolib-acpi.h
@@ -7981,6 +7984,12 @@ L:       dmaengine@vger.kernel.org
 S:     Maintained
 F:     drivers/dma/hisi_dma.c
 
+HISILICON GPIO DRIVER
+M:     Luo Jiaxing <luojiaxing@huawei.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-hisi.c
+
 HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 M:     Zaibo Xu <xuzaibo@huawei.com>
 L:     linux-crypto@vger.kernel.org
@@ -19500,6 +19509,16 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/net/can/xilinx_can.txt
 F:     drivers/net/can/xilinx_can.c
 
+XILINX GPIO DRIVER
+M:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
+R:     Srinivas Neeli <srinivas.neeli@xilinx.com>
+R:     Michal Simek <michal.simek@xilinx.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
+F:     Documentation/devicetree/bindings/gpio/gpio-zynq.txt
+F:     drivers/gpio/gpio-xilinx.c
+F:     drivers/gpio/gpio-zynq.c
+
 XILINX SD-FEC IP CORES
 M:     Derek Kiernan <derek.kiernan@xilinx.com>
 M:     Dragan Cvetic <dragan.cvetic@xilinx.com>