[PATCH 2/2] MAINTAINERS: Put together AMD/XILINX platforms to one fragment

Put together multiple SOCs fragment under the same umbrella to cover all
ARM based AMD/Xilinx platforms. Also use this oportunity to simplify
description and remove files are already covered by N:.
Also move N: xilinx from Microblaze because multiple files have been added
over years which belong to ARM SOCs instead of Microblaze.

Signed-off-by: Michal Simek <[email protected]>
---

 MAINTAINERS | 70 +++++++++++++++--------------------------------------
 1 file changed, 19 insertions(+), 51 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b07ab6656a9..e1171f4d01b4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,25 @@ F:	drivers/ddr/altera/
 F:	drivers/power/domain/altr-pmgr-agilex5.c
 F:	drivers/sysreset/sysreset_socfpga*
 
+ARM AMD/XILINX
+M:	Michal Simek <[email protected]>
+M:	Michal Simek <[email protected]>
+S:	Maintained
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
+F:	doc/device-tree-bindings/video/syncoam,seps525.txt
+F:	drivers/gpio/gpio_slg7xl45106.c
+F:	drivers/i2c/i2c-cdns.c
+F:	drivers/i2c/muxes/pca954x.c
+F:	drivers/net/phy/ethernet_id.c
+F:	drivers/pwm/pwm-cadence-ttc.c
+F:	drivers/timer/cadence-ttc.c
+F:	drivers/video/seps525.c
+F:	drivers/watchdog/cdns_wdt.c
+N:	(?<!uni)versal
+N:	ultra96
+N:	zynq
+N:	xilinx
+
 ARM AMLOGIC SOC SUPPORT
 M:	Neil Armstrong <[email protected]>
 S:	Maintained
@@ -802,31 +821,6 @@ F:	arch/arm/mach-uniphier/
 F:	configs/uniphier_*_defconfig
 N:	uniphier
 
-ARM VERSAL NET
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal-net/
-F:	drivers/soc/soc_xilinx_versal_net.c
-N:	(?<!uni)versal-net
-
-ARM VERSAL
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal/
-F:	drivers/net/xilinx_axi_mrmac.*
-F:	drivers/soc/soc_xilinx_versal.c
-F:	drivers/spi/cadence_ospi_versal.c
-F:	drivers/watchdog/xilinx_wwdt.c
-N:	(?<!uni)versal
-
-ARM VERSAL GEN 2
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal2/
-
 ARM VERSATILE EXPRESS DRIVERS
 M:	Liviu Dudau <[email protected]>
 S:	Maintained
@@ -834,31 +828,6 @@ T:	git git://github.com/ARM-software/u-boot.git
 F:	drivers/misc/vexpress_config.c
 N:	vexpress
 
-ARM ZYNQ and ZYNQMP
-M:	Michal Simek <[email protected]>
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	doc/board/xilinx/
-F:	doc/device-tree-bindings/video/syncoam,seps525.txt
-F:	drivers/gpio/gpio_slg7xl45106.c
-F:	drivers/i2c/i2c-cdns.c
-F:	drivers/i2c/muxes/pca954x.c
-F:	drivers/net/phy/ethernet_id.c
-F:	drivers/net/phy/xilinx_phy.c
-F:	drivers/pwm/pwm-cadence-ttc.c
-F:	drivers/timer/cadence-ttc.c
-F:	drivers/video/seps525.c
-F:	drivers/watchdog/cdns_wdt.c
-N:	ultra96
-N:	zynq
-
-ARM ZYNQMP R5
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-zynqmp-r5/
-
 ARM PHYTIUM
 M:	liuhao <[email protected]>
 M:	shuyiqi <[email protected]>
@@ -1285,7 +1254,6 @@ F:	drivers/spi/xilinx_spi.c
 F:	drivers/sysreset/sysreset_gpio.c
 F:	drivers/timer/xilinx-timer.c
 F:	drivers/watchdog/xilinx_tb_wdt.c
-N:	xilinx
 
 MIPS
 M:	Daniel Schwierzeck <[email protected]>
-- 
2.43.0