Hi Jonas,
On 8/17/23 08:04, Jonas Karlman wrote:
Update MAINTAINERS files for RK3566/RK3568/RK3588 boards to include
related device tree files. Also replace space with tabs.
Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
---
board/anbernic/rgxx3_rk3566/MAINTAINERS | 3 ++
.../neural-compute-module-6/MAINTAINERS | 6 +++
board/radxa/rock5a-rk3588s/MAINTAINERS | 2 +
board/radxa/rock5b-rk3588/MAINTAINERS | 4 +-
board/rockchip/evb_rk3568/MAINTAINERS | 51 ++++++++++---------
board/rockchip/evb_rk3588/MAINTAINERS | 3 +-
6 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/board/anbernic/rgxx3_rk3566/MAINTAINERS
b/board/anbernic/rgxx3_rk3566/MAINTAINERS
index 1c0d3fe7b5bf..6be16a47e8eb 100644
--- a/board/anbernic/rgxx3_rk3566/MAINTAINERS
+++ b/board/anbernic/rgxx3_rk3566/MAINTAINERS
@@ -4,3 +4,6 @@ S: Maintained
F: board/anbernic/rgxx3_rk3566
F: include/configs/anbernic-rgxx3-rk3566.h
F: configs/anbernic-rgxx3_defconfig
+F: arch/arm/dts/rk3566-anbernic-rgxx3.dts
+F: arch/arm/dts/rk3566-anbernic-rgxx3.dtsi
+F: arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
An easier way to deal with this is to use the "*" character since it's
supported in MAINTAINERS file apparently (ag -Q "*" **/MAINTAINERS
returns multiple matches in multiple files). So maybe replace it with
something like
F: arch/arm/dts/rk3566-anbernic-rgxx3*
?
That way if the files eventually get split into multiple ones, get
renamed, have one created (e.g. -u-boot.dtsi), they are all matched by
that same line. Less maintenance here (and hopefully precise enough that
we don't have false positives).
Just a suggestion,
Cheers,
Quentin
diff --git a/board/edgeble/neural-compute-module-6/MAINTAINERS
b/board/edgeble/neural-compute-module-6/MAINTAINERS
index bc7f9b0e680d..42e5df506bf3 100644
--- a/board/edgeble/neural-compute-module-6/MAINTAINERS
+++ b/board/edgeble/neural-compute-module-6/MAINTAINERS
@@ -5,3 +5,9 @@ F: board/edgeble/neural-compute-module-6
F: include/configs/neural-compute-module-6.h
F: configs/neu6a-io-rk3588_defconfig
F: configs/neu6b-io-rk3588_defconfig
+F: arch/arm/dts/rk3588-edgeble-neu6a.dtsi
+F: arch/arm/dts/rk3588-edgeble-neu6a-io.dts
+F: arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
+F: arch/arm/dts/rk3588-edgeble-neu6b.dtsi
+F: arch/arm/dts/rk3588-edgeble-neu6b-io.dts
+F: arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
diff --git a/board/radxa/rock5a-rk3588s/MAINTAINERS
b/board/radxa/rock5a-rk3588s/MAINTAINERS
index 62fb6b4c0eea..05750269b8dd 100644
--- a/board/radxa/rock5a-rk3588s/MAINTAINERS
+++ b/board/radxa/rock5a-rk3588s/MAINTAINERS
@@ -4,3 +4,5 @@ S: Maintained
F: board/radxa/rock5a-rk3588s
F: include/configs/rock5a-rk3588s.h
F: configs/rock5a-rk3588s_defconfig
+F: arch/arm/dts/rk3588s-rock-5a.dts
+F: arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
diff --git a/board/radxa/rock5b-rk3588/MAINTAINERS
b/board/radxa/rock5b-rk3588/MAINTAINERS
index 693751e583d9..734115a4a3dc 100644
--- a/board/radxa/rock5b-rk3588/MAINTAINERS
+++ b/board/radxa/rock5b-rk3588/MAINTAINERS
@@ -2,5 +2,7 @@ ROCK5B-RK3588
M: Eugen Hristev <eugen.hris...@collabora.com>
S: Maintained
F: board/radxa/rock5b-rk3588
-F: include/configs/rock5b-rk3588
+F: include/configs/rock5b-rk3588.h
F: configs/rock5b-rk3588_defconfig
+F: arch/arm/dts/rk3588-rock-5b.dts
+F: arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
diff --git a/board/rockchip/evb_rk3568/MAINTAINERS
b/board/rockchip/evb_rk3568/MAINTAINERS
index 1cdeafcf79b2..5a2ec13e21ee 100644
--- a/board/rockchip/evb_rk3568/MAINTAINERS
+++ b/board/rockchip/evb_rk3568/MAINTAINERS
@@ -1,13 +1,13 @@
EVB-RK3568
-M: Joseph Chen <che...@rock-chips.com>
-S: Maintained
-F: board/rockchip/evb_rk3568
-F: include/configs/evb_rk3568.h
-F: configs/evb-rk3568_defconfig
-F: arch/arm/dts/rk3568-evb-boot.dtsi
+M: Joseph Chen <che...@rock-chips.com>
+S: Maintained
+F: board/rockchip/evb_rk3568
+F: include/configs/evb_rk3568.h
+F: configs/evb-rk3568_defconfig
+F: arch/arm/dts/rk3568-evb-u-boot.dtsi
F: arch/arm/dts/rk3568-evb.dts
-Lubancat-2
+LUBANCAT-2
M: Andy Yan <andys...@163.com>
S: Maintained
F: configs/lubancat-2-rk3568_defconfig
@@ -15,24 +15,27 @@ F: arch/arm/dts/rk3568-lubancat-2.dts
F: arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
NANOPI-R5C
-M: Tianling Shen <cns...@gmail.com>
-S: Maintained
-F: configs/nanopi-r5c-rk3568_defconfig
-F: arch/arm/dts/rk3568-nanopi-r5c.dts
-F: arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
+M: Tianling Shen <cns...@gmail.com>
+S: Maintained
+F: configs/nanopi-r5c-rk3568_defconfig
+F: arch/arm/dts/rk3568-nanopi-r5c.dts
+F: arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
NANOPI-R5S
-M: Tianling Shen <cns...@gmail.com>
-S: Maintained
-F: configs/nanopi-r5s-rk3568_defconfig
-F: arch/arm/dts/rk3568-nanopi-r5s.dts
-F: arch/arm/dts/rk3568-nanopi-r5s.dtsi
-F: arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
+M: Tianling Shen <cns...@gmail.com>
+S: Maintained
+F: configs/nanopi-r5s-rk3568_defconfig
+F: arch/arm/dts/rk3568-nanopi-r5s.dts
+F: arch/arm/dts/rk3568-nanopi-r5s.dtsi
+F: arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
-RADXA-CM3
+RADXA-CM3-IO
M: Jagan Teki <ja...@amarulasolutions.com>
S: Maintained
F: configs/radxa-cm3-io-rk3566_defconfig
+F: arch/arm/dts/rk3566-radxa-cm3.dtsi
+F: arch/arm/dts/rk3566-radxa-cm3-io.dts
+F: arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
RADXA-E25
M: Jonas Karlman <jo...@kwiboo.se>
@@ -43,8 +46,8 @@ F: arch/arm/dts/rk3568-radxa-e25.dts
F: arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
ROCK-3A
-M: Akash Gajjar <gajjar04ak...@gmail.com>
-S: Maintained
-F: configs/rock-3a-rk3568_defconfig
-F: arch/arm/dts/rk3568-rock-3a.dts
-F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+M: Akash Gajjar <gajjar04ak...@gmail.com>
+S: Maintained
+F: configs/rock-3a-rk3568_defconfig
+F: arch/arm/dts/rk3568-rock-3a.dts
+F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
diff --git a/board/rockchip/evb_rk3588/MAINTAINERS
b/board/rockchip/evb_rk3588/MAINTAINERS
index 7b7df3c5a8ac..6b2c257a1705 100644
--- a/board/rockchip/evb_rk3588/MAINTAINERS
+++ b/board/rockchip/evb_rk3588/MAINTAINERS
@@ -4,4 +4,5 @@ S: Maintained
F: board/rockchip/evb_rk3588
F: include/configs/evb_rk3588.h
F: configs/evb-rk3588_defconfig
-F: arch/arm/dts/rk3588-evb-u-boot.dtsi
+F: arch/arm/dts/rk3588-evb1-v10.dts
+F: arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi
