From 710d7f27e29d76e5a387ded95963ecd47dc784a9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 12 Mar 2024 23:36:11 +0000
Subject: [PATCH] board: rockchip: rk3399: Add device tree files to MAINTAINERS

Update MAINTAINERS files for RK3399 boards to include related device
tree files. Also correct a few filenames.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
 board/firefly/roc-pc-rk3399/MAINTAINERS       |  1 +
 board/pine64/pinebook-pro-rk3399/MAINTAINERS  |  5 ++-
 board/pine64/pinephone-pro-rk3399/MAINTAINERS |  5 ++-
 board/pine64/rockpro64_rk3399/MAINTAINERS     |  2 +-
 board/rockchip/evb_rk3399/MAINTAINERS         | 35 ++++++++++---------
 board/vamrs/rock960_rk3399/MAINTAINERS        |  2 ++
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/board/firefly/roc-pc-rk3399/MAINTAINERS b/board/firefly/roc-pc-rk3399/MAINTAINERS
index 68a5b757d1..2c0de4432f 100644
--- a/board/firefly/roc-pc-rk3399/MAINTAINERS
+++ b/board/firefly/roc-pc-rk3399/MAINTAINERS
@@ -6,3 +6,4 @@ F:	board/firefly/roc-pc-rk3399
 F:	include/configs/roc-pc-rk3399.h
 F:	configs/roc-pc-rk3399_defconfig
 F:	configs/roc-pc-mezzanine-rk3399_defconfig
+F:	arch/arm/dts/rk3399-roc-pc*
diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
index 7300ca1b1b..287ed43460 100644
--- a/board/pine64/pinebook-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
@@ -2,7 +2,6 @@ PINEBOOK_PRO
 M:	Peter Robinson <pbrobinson@gmail.com>
 S:	Maintained
 F:	board/pine64/pinebook-pro-rk3399/
-F:	include/configs/rk3399-pinebook-pro.h
-F:	arch/arm/dts/rk3399-pinebook-pro.dts
-F:	arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+F:	include/configs/pinebook-pro-rk3399.h
+F:	arch/arm/dts/rk3399-pinebook-pro*
 F:	configs/pinebook-pro-rk3399_defconfig
diff --git a/board/pine64/pinephone-pro-rk3399/MAINTAINERS b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
index bc2dcdd8d4..959566a877 100644
--- a/board/pine64/pinephone-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
@@ -2,7 +2,6 @@ PINEPHONE_PRO
 M:	Peter Robinson <pbrobinson@gmail.com>
 S:	Maintained
 F:	board/pine64/pinephone-pro-rk3399/
-F:	include/configs/rk3399-pinephone-pro.h
-F:	arch/arm/dts/rk3399-pinephone-pro.dts
-F:	arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+F:	include/configs/pinephone-pro-rk3399.h
+F:	arch/arm/dts/rk3399-pinephone-pro*
 F:	configs/pinephone-pro-rk3399_defconfig
diff --git a/board/pine64/rockpro64_rk3399/MAINTAINERS b/board/pine64/rockpro64_rk3399/MAINTAINERS
index 220ee21f23..d9e11f4bab 100644
--- a/board/pine64/rockpro64_rk3399/MAINTAINERS
+++ b/board/pine64/rockpro64_rk3399/MAINTAINERS
@@ -3,5 +3,5 @@ M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	board/pine64/rockpro64_rk3399
 F:	include/configs/rockpro64_rk3399.h
-F:	arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+F:	arch/arm/dts/rk3399-rockpro64*
 F:	configs/rockpro64-rk3399_defconfig
diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
index acdb840f20..f45f81623a 100644
--- a/board/rockchip/evb_rk3399/MAINTAINERS
+++ b/board/rockchip/evb_rk3399/MAINTAINERS
@@ -4,48 +4,53 @@ S:      Maintained
 F:      board/rockchip/evb_rk3399
 F:      include/configs/evb_rk3399.h
 F:      configs/evb-rk3399_defconfig
+F:      arch/arm/dts/rk3399-evb*
 F:      configs/firefly-rk3399_defconfig
+F:      arch/arm/dts/rk3399-firefly*
 
 EAIDK-610
 M:      Andy Yan <andy.yan@rock-chips.com>
 S:      Maintained
 F:	configs/eaidk-610-rk3399_defconfig
-F:	arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
+F:	arch/arm/dts/rk3399-eaidk-610*
 
 KHADAS-EDGE
 M:	Nick Xie <nick@khadas.com>
 S:	Maintained
 F:	configs/khadas-edge-rk3399_defconfig
+F:	arch/arm/dts/rk3399-khadas-edge.dts
+F:	arch/arm/dts/rk3399-khadas-edge.dtsi
 F:	arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
 
 KHADAS-EDGE-CAPTAIN
 M:	Nick Xie <nick@khadas.com>
 S:	Maintained
 F:	configs/khadas-edge-captain-rk3399_defconfig
-F:	arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi
+F:	arch/arm/dts/rk3399-khadas-edge-captain*
 
 KHADAS-EDGE-V
 M:	Nick Xie <nick@khadas.com>
 S:	Maintained
 F:	configs/khadas-edge-v-rk3399_defconfig
-F:	arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi
+F:	arch/arm/dts/rk3399-khadas-edge-v*
 
 LEEZ-P710
 M:	Andy Yan <andy.yan@rock-chips.com>
 S:      Maintained
-F:	arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
+F:	arch/arm/dts/rk3399-leez-p710*
 F:	configs/leez-rk3399_defconfig
 
 NANOPC-T4
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/nanopc-t4-rk3399_defconfig
-F:	arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopc-t4*
 
 NANOPI-M4
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/nanopi-m4-rk3399_defconfig
+F:	arch/arm/dts/rk3399-nanopi-m4.dts
 F:	arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi
 
 NANOPI-M4-2GB
@@ -53,55 +58,53 @@ M:	Jagan Teki <jagan@amarulasolutions.com>
 M:	Deepak Das <deepakdas.linux@gmail.com>
 S:	Maintained
 F:	configs/nanopi-m4-2gb-rk3399_defconfig
-F:	arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopi-m4-2gb*
 
 NANOPI-M4B
 M:	Alexandre Vicenzi <linux@alxd.me>
 S:	Maintained
 F:	configs/nanopi-m4b-rk3399_defconfig
-F:	arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopi-m4b*
 
 NANOPI-NEO4
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/nanopi-neo4-rk3399_defconfig
-F:	arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopi-neo4*
 
 NANOPI-R4S
 M:	Xiaobo Tian <peterwillcn@gmail.com>
 S:	Maintained
 F:	configs/nanopi-r4s-rk3399_defconfig
-F:	arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopi-r4s*
 
 ORANGEPI-RK3399
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/orangepi-rk3399_defconfig
-F:	arch/arm/dts/rk3399-u-boot.dtsi
-F:	arch/arm/dts/rk3399-orangepi-u-boot.dtsi
+F:	arch/arm/dts/rk3399-orangepi*
 
 ROCK-4C+
 M:	FUKAUMI Naoki <naoki@radxa.com>
 S:	Maintained
 F:	configs/rock-4c-plus-rk3399_defconfig
-F:	arch/arm/dts/rk3399-rock-4c-plus.dts
+F:	arch/arm/dts/rk3399-rock-4c-plus*
 
 ROCK-4SE
 M:	Christopher Obbard <chris.obbard@collabora.com>
 S:	Maintained
 F:	configs/rock-4se-rk3399_defconfig
-F:	arch/arm/dts/rk3399-rock-4se-u-boot.dtsi
+F:	arch/arm/dts/rk3399-rock-4se*
 
 ROCK-PI-4
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/rock-pi-4-rk3399_defconfig
-F:	arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
 F:	configs/rock-pi-4c-rk3399_defconfig
-F:	arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi
+F:	arch/arm/dts/rk3399-rock-pi-4*
 
 ROCK-PI-N10
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/rock-pi-n10-rk3399pro_defconfig
-F:	arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi
+F:	arch/arm/dts/rk3399pro-rock-pi-n10*
diff --git a/board/vamrs/rock960_rk3399/MAINTAINERS b/board/vamrs/rock960_rk3399/MAINTAINERS
index 8821672a3a..f2121b1914 100644
--- a/board/vamrs/rock960_rk3399/MAINTAINERS
+++ b/board/vamrs/rock960_rk3399/MAINTAINERS
@@ -4,8 +4,10 @@ S:      Maintained
 F:      board/vamrs/rock960_rk3399/
 F:      include/configs/rock960_rk3399.h
 F:      configs/rock960-rk3399_defconfig
+F:      arch/arm/dts/rk3399-rock960*
 
 FICUS EE
 M:      Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 S:      Maintained
 F:	configs/ficus-rk3399_defconfig
+F:	arch/arm/dts/rk3399-ficus*
-- 
2.39.5