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> --- MAINTAINERS | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c87b94e6b2f6..b1382f73ec28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11259,14 +11259,16 @@ L: alsa-devel@xxxxxxxxxxxxxxxx (moderated for non-subscribers) S: Supported F: sound/soc/atmel -MICROCHIP DMA DRIVER +MICROCHIP 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 @@ -11406,13 +11408,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
