MAINTAINERS: Merge ARM/Renesas ARM64 and ARM/SH-Mobile ARM architectures

There is not much point in having separate entries for the ARM/Renesas
ARM64 and ARM/SH-Mobile ARM architectures, as they have the same
maintainers, use the same development collaboration infrastructure, and
share many files.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/a869b8afdc47aa637ebeefcc1ca7bc61244f34b9.1660898008.git.geert+renesas@glider.be

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012ba6ff98ac6f4a1415b3fce51423329c2d2..62403f303bbd86ab9a1b2696f8cd71849fa392bd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2650,7 +2650,7 @@ F:        arch/arm/boot/dts/rtd*
 F:     arch/arm/mach-realtek/
 F:     arch/arm64/boot/dts/realtek/
 
-ARM/RENESAS ARM64 ARCHITECTURE
+ARM/RENESAS ARCHITECTURE
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 M:     Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
@@ -2661,6 +2661,16 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git nex
 F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
 F:     Documentation/devicetree/bindings/soc/renesas/
+F:     arch/arm/boot/dts/emev2*
+F:     arch/arm/boot/dts/gr-peach*
+F:     arch/arm/boot/dts/iwg20d-q7*
+F:     arch/arm/boot/dts/r7s*
+F:     arch/arm/boot/dts/r8a*
+F:     arch/arm/boot/dts/r9a*
+F:     arch/arm/boot/dts/sh*
+F:     arch/arm/configs/shmobile_defconfig
+F:     arch/arm/include/debug/renesas-scif.S
+F:     arch/arm/mach-shmobile/
 F:     arch/arm64/boot/dts/renesas/
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
@@ -2772,29 +2782,6 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/platform/samsung/s5p-mfc/
 
-ARM/SHMOBILE ARM ARCHITECTURE
-M:     Geert Uytterhoeven <geert+renesas@glider.be>
-M:     Magnus Damm <magnus.damm@gmail.com>
-L:     linux-renesas-soc@vger.kernel.org
-S:     Supported
-Q:     http://patchwork.kernel.org/project/linux-renesas-soc/list/
-C:     irc://irc.libera.chat/renesas-soc
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
-F:     Documentation/devicetree/bindings/arm/renesas.yaml
-F:     Documentation/devicetree/bindings/soc/renesas/
-F:     arch/arm/boot/dts/emev2*
-F:     arch/arm/boot/dts/gr-peach*
-F:     arch/arm/boot/dts/iwg20d-q7*
-F:     arch/arm/boot/dts/r7s*
-F:     arch/arm/boot/dts/r8a*
-F:     arch/arm/boot/dts/r9a*
-F:     arch/arm/boot/dts/sh*
-F:     arch/arm/configs/shmobile_defconfig
-F:     arch/arm/include/debug/renesas-scif.S
-F:     arch/arm/mach-shmobile/
-F:     drivers/soc/renesas/
-F:     include/linux/soc/renesas/
-
 ARM/SOCFPGA ARCHITECTURE
 M:     Dinh Nguyen <dinguyen@kernel.org>
 S:     Maintained