Merge tag 'pinctrl-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[muen/linux.git] / MAINTAINERS
index 4825cd8..9acc413 100644 (file)
@@ -11919,18 +11919,12 @@ F:    Documentation/driver-api/pinctl.rst
 F:     drivers/pinctrl/
 F:     include/linux/pinctrl/
 
-PIN CONTROLLER - ATMEL AT91
-M:     Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/pinctrl/pinctrl-at91.*
-
-PIN CONTROLLER - ATMEL AT91 PIO4
+PIN CONTROLLER - MICROCHIP AT91
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-gpio@vger.kernel.org
 S:     Supported
-F:     drivers/pinctrl/pinctrl-at91-pio4.*
+F:     drivers/pinctrl/pinctrl-at91*
 
 PIN CONTROLLER - FREESCALE
 M:     Dong Aisheng <aisheng.dong@nxp.com>
@@ -11966,11 +11960,11 @@ F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
 F:     drivers/pinctrl/qcom/
 
 PIN CONTROLLER - RENESAS
-M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 S:     Maintained
+F:     drivers/pinctrl/pinctrl-rz*
 F:     drivers/pinctrl/sh-pfc/
 
 PIN CONTROLLER - SAMSUNG