Add Tudor Ambarus as co-maintainer for both Microchip DMA drivers and take the opportunity to merge both entries. Signed-off-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> --- v2: - Rename the entry to be more specific and to avoid collision with other Microchip's DMA drivers. MAINTAINERS | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ea296f213e45..4a0a28c59bb3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11240,6 +11240,19 @@ W: http://www.monstr.eu/fdt/ T: git git://git.monstr.eu/linux-2.6-microblaze.git F: arch/microblaze/ +MICROCHIP AT91 DMA DRIVERS +M: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> +M: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> +L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) +L: dmaengine@xxxxxxxxxxxxxxx +S: Supported +F: Documentation/devicetree/bindings/dma/atmel-dma.txt +F: drivers/dma/at_hdmac.c +F: drivers/dma/at_hdmac_regs.h +F: drivers/dma/at_xdmac.c +F: include/dt-bindings/dma/at91.h +F: include/linux/platform_data/dma-atmel.h + MICROCHIP AT91 SERIAL DRIVER M: Richard Genoud <richard.genoud@xxxxxxxxx> S: Maintained @@ -11268,17 +11281,6 @@ L: alsa-devel@xxxxxxxxxxxxxxxx (moderated for non-subscribers) S: Supported F: sound/soc/atmel -MICROCHIP DMA DRIVER -M: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> -L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) -L: dmaengine@xxxxxxxxxxxxxxx -S: Supported -F: Documentation/devicetree/bindings/dma/atmel-dma.txt -F: drivers/dma/at_hdmac.c -F: drivers/dma/at_hdmac_regs.h -F: include/dt-bindings/dma/at91.h -F: include/linux/platform_data/dma-atmel.h - MICROCHIP ECC DRIVER M: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> L: linux-crypto@xxxxxxxxxxxxxxx @@ -11415,13 +11417,6 @@ L: linux-wireless@xxxxxxxxxxxxxxx S: Supported F: drivers/net/wireless/microchip/wilc1000/ -MICROCHIP XDMA DRIVER -M: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> -L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx -L: dmaengine@xxxxxxxxxxxxxxx -S: Supported -F: drivers/dma/at_xdmac.c - MICROSEMI MIPS SOCS M: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> M: Microchip Linux Driver Support <UNGLinuxDriver@xxxxxxxxxxxxx> -- 2.24.0
