S:     Maintained
 F:     drivers/clk/at91
 
-ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
-M:     Nicolas Ferre <nicolas.ferre@microchip.com>
-M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.linux4sam.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
-S:     Supported
-N:     at91
-N:     atmel
-F:     arch/arm/mach-at91/
-F:     include/soc/at91/
-F:     arch/arm/boot/dts/at91*.dts
-F:     arch/arm/boot/dts/at91*.dtsi
-F:     arch/arm/boot/dts/sama*.dts
-F:     arch/arm/boot/dts/sama*.dtsi
-F:     arch/arm/include/debug/at91.S
-F:     drivers/memory/atmel*
-F:     drivers/watchdog/sama5d4_wdt.c
-X:     drivers/input/touchscreen/atmel_mxt_ts.c
-X:     drivers/net/wireless/atmel/
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 F:     arch/arm/mach-ks8695/
 S:     Odd Fixes
 
+ARM/Microchip (AT91) SoC support
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
+M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:     http://www.linux4sam.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
+S:     Supported
+N:     at91
+N:     atmel
+F:     arch/arm/mach-at91/
+F:     include/soc/at91/
+F:     arch/arm/boot/dts/at91*.dts
+F:     arch/arm/boot/dts/at91*.dtsi
+F:     arch/arm/boot/dts/sama*.dts
+F:     arch/arm/boot/dts/sama*.dtsi
+F:     arch/arm/include/debug/at91.S
+F:     drivers/memory/atmel*
+F:     drivers/watchdog/sama5d4_wdt.c
+X:     drivers/input/touchscreen/atmel_mxt_ts.c
+X:     drivers/net/wireless/atmel/
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)