Skip to contentSkip to conversation

rockchip: MAINTAINERS: upstream devicetree update

PATCH In review Johan Jonker 4 participants 4 messages May 17 – Jun 8 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rockchip: MAINTAINERS: upstream devicetree update

Most Rockchip boards are now using the upstream device tree. Some MAINTAINERS files still contain a reference to no longer available files. Update and where possible streamline with '*' ending.

---
 .../neural-compute-module-6/MAINTAINERS       |  8 +---
 board/hardkernel/odroid_m1/MAINTAINERS        |  3 +-
 board/khadas/khadas-edge2-rk3588s/MAINTAINERS |  2 +-
 board/pine64/quartz64_rk3566/MAINTAINERS      | 21 ++--------
 board/pine64/quartzpro64-rk3588/MAINTAINERS   |  3 +-
 board/radxa/rock5a-rk3588s/MAINTAINERS        |  3 +-
 board/rockchip/evb_rk3328/MAINTAINERS         | 14 ++-----
 board/rockchip/evb_rk3399/MAINTAINERS         |  7 +---
 board/rockchip/evb_rk3568/MAINTAINERS         | 38 +++++++------------
 board/rockchip/evb_rk3588/MAINTAINERS         | 21 ++++------
 board/rockchip/toybrick_rk3588/MAINTAINERS    |  3 +-
 board/turing/turing-rk1-rk3588/MAINTAINERS    |  4 +-
 .../orangepi-5-ultra-rk3588/MAINTAINERS       |  2 +-
 13 files changed, 37 insertions(+), 92 deletions(-)
board/edgeble/neural-compute-module-6/MAINTAINERS +2 -6
index 42e5df506bf3..97d8c96ae628 100644
@@ -5,9 +5,5 @@ 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
+F:	arch/arm/dts/rk3588-edgeble-neu6a-io*
+F:	arch/arm/dts/rk3588-edgeble-neu6b-io*
board/hardkernel/odroid_m1/MAINTAINERS +1 -2
index 165d2d96741d..8686a552d1c6 100644
@@ -4,5 +4,4 @@ S:	Maintained
 F:	board/hardkernel/odroid_m1/
 F:	include/configs/odroid_m1.h
 F:	configs/odroid-m1-rk3568_defconfig
-F:	arch/arm/dts/rk3568-odroid-m1.dts
-F:	arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+F:	arch/arm/dts/rk3568-odroid-m1*
board/khadas/khadas-edge2-rk3588s/MAINTAINERS +1 -1
index 3f16923b0f25..c43f469589dd 100644
@@ -3,4 +3,4 @@ M:	Jacobe Zang <[email protected]>
 S:	Maintained
 F:	configs/khadas-edge2-rk3588s_defconfig
 F:	include/configs/khadas-edge2-rk3588s.h
-F:	dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
\ No newline at end of file
+F:	arch/arm/dts/rk3588s-khadas-edge2*
board/pine64/quartz64_rk3566/MAINTAINERS +3 -18
index 37b8c1eb78b6..955cb5de0300 100644
@@ -9,26 +9,11 @@ F:	configs/quartz64-b-rk3566_defconfig
 F:	configs/soquartz-blade-rk3566_defconfig
 F:	configs/soquartz-cm4-rk3566_defconfig
 F:	configs/soquartz-model-a-rk3566_defconfig
-F:	arch/arm/dts/rk3566-quartz64-a.dts
-F:	arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
-F:	arch/arm/dts/rk3566-quartz64-b.dts
-F:	arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz.dtsi
-F:	arch/arm/dts/rk3566-soquartz-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-blade.dts
-F:	arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-cm4.dts
-F:	arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-model-a.dts
-F:	arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi
+F:	arch/arm/dts/rk3566-quartz64*
+F:	arch/arm/dts/rk3566-soquartz*
 
 PINETAB2-RK3566
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/pinetab2-rk3566_defconfig
-F:	arch/arm/dts/rk3566-pinetab2.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-v0.1.dts
-F:	arch/arm/dts/rk3566-pinetab2-v0.1-u-boot.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-v2.0.dts
-F:	arch/arm/dts/rk3566-pinetab2-v2.0-u-boot.dtsi
+F:	arch/arm/dts/rk3566-pinetab2*
board/pine64/quartzpro64-rk3588/MAINTAINERS +1 -2
index a7e944b74781..ff3500a32fc0 100644
@@ -4,5 +4,4 @@ S:	Maintained
 F:	board/pine64/quartzpro64-rk3588
 F:	include/configs/quartzpro64-rk3588.h
 F:	configs/quartzpro64-rk3588_defconfig
-F:	arch/arm/dts/rk3588-quartzpro64.dts
-F:	arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+F:	arch/arm/dts/rk3588-quartzpro64*
board/radxa/rock5a-rk3588s/MAINTAINERS +1 -2
index afc9bf5706c9..d4cd82139d51 100644
@@ -5,5 +5,4 @@ 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
+F:	arch/arm/dts/rk3588s-rock-5a*
board/rockchip/evb_rk3328/MAINTAINERS +3 -11
index 8c9b42fe2bbf..d8748c1c2a26 100644
@@ -4,8 +4,7 @@ S:      Maintained
 F:      board/rockchip/evb_rk3328
 F:      include/configs/evb_rk3328.h
 F:      configs/evb-rk3328_defconfig
-F:      arch/arm/dts/rk3328-evb.dts
-F:      arch/arm/dts/rk3328-evb-u-boot.dtsi
+F:      arch/arm/dts/rk3328-evb*
 
 GENERIC-RK3328
 M:	Jonas Karlman <[email protected]>
@@ -17,14 +16,12 @@ NANOPI-R2C-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
 
 NANOPI-R2C-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c-plus.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
 
 NANOPI-R2S-RK3328
@@ -32,7 +29,6 @@ M:      David Bauer <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2s-rk3328_defconfig
 F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-F:      arch/arm/dts/rk3328-nanopi-r2s.dts
 
 NANOPI-R2S-PLUS-RK3328
 M:      Jonas Karlman <[email protected]>
@@ -44,14 +40,12 @@ ORANGEPI-R1-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
 
 ORANGEPI-R1-PLUS-LTS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-lts-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
 
 ROC-RK3328-CC
@@ -60,16 +54,14 @@ M:      Chen-Yu Tsai <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/roc-cc-rk3328_defconfig
-F:      arch/arm/dts/rk3328-roc-cc.dts
-F:      arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+F:      arch/arm/dts/rk3328-roc-cc*
 
 ROCK64-RK3328
 M:      Matwey V. Kornilov <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/rock64-rk3328_defconfig
-F:      arch/arm/dts/rk3328-rock64.dts
-F:      arch/arm/dts/rk3328-rock64-u-boot.dtsi
+F:      arch/arm/dts/rk3328-rock64*
 
 ROCKPIE-RK3328
 M:      Banglang Huang <[email protected]>
board/rockchip/evb_rk3399/MAINTAINERS +2 -5
index 8319db2e976c..860dd0287597 100644
@@ -24,9 +24,7 @@ KHADAS-EDGE
 M:	Nick Xie <[email protected]>
 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
+F:	arch/arm/dts/rk3399-khadas-edge*
 
 KHADAS-EDGE-CAPTAIN
 M:	Nick Xie <[email protected]>
@@ -56,8 +54,7 @@ NANOPI-M4
 M:	Jagan Teki <[email protected]>
 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
+F:	arch/arm/dts/rk3399-nanopi-m4*
 
 NANOPI-M4-2GB
 M:	Jagan Teki <[email protected]>
board/rockchip/evb_rk3568/MAINTAINERS +13 -25
index 030cdbe6f3db..7e17a6a987a5 100644
@@ -2,8 +2,7 @@ BANANAPI-BPI-R2-PRO
 M:	Frank Wunderlich <[email protected]>
 S:	Maintained
 F:	configs/bpi-r2-pro-rk3568_defconfig
-F:	arch/arm/dts/rk3568-bpi-r2-pro.dts
-F:	arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
+F:	arch/arm/dts/rk3568-bpi-r2-pro*
 
 EVB-RK3568
 M:	Joseph Chen <[email protected]>
@@ -11,78 +10,67 @@ 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
+F:	arch/arm/dts/rk3568-evb*
 
 FASTRHINO-R66S-RK3568
 M:	Tianling Shen <[email protected]>
 R:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/fastrhino-r66s-rk3568_defconfig
-F:	arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
+F:	arch/arm/dts/rk3568-fastrhino-r66s*
 
 GENERIC-RK3568
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/generic-rk3568_defconfig
-F:	arch/arm/dts/rk3568-generic.dts
-F:	arch/arm/dts/rk3568-generic-u-boot.dtsi
+F:	arch/arm/dts/rk3568-generic*
 
 LUBANCAT-2
 M:	Andy Yan <[email protected]>
 S:	Maintained
 F:	configs/lubancat-2-rk3568_defconfig
-F:	arch/arm/dts/rk3568-lubancat-2.dts
-F:	arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+F:	arch/arm/dts/rk3568-lubancat-2*
 
 NANOPI-R3S
 M:	Tianling Shen <[email protected]>
 R:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/nanopi-r3s-rk3566_defconfig
-F:	arch/arm/dts/rk3566-nanopi-r3s-u-boot.dtsi
+F:	arch/arm/dts/rk3566-nanopi-r3s*
 
 NANOPI-R5C
 M:	Tianling Shen <[email protected]>
 R:	Jonas Karlman <[email protected]>
 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
+F:	arch/arm/dts/rk3568-nanopi-r5c*
 
 NANOPI-R5S
 M:	Tianling Shen <[email protected]>
 R:	Jonas Karlman <[email protected]>
 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
+F:	arch/arm/dts/rk3568-nanopi-r5s*
 
 RADXA-CM3-IO
 M:	Jagan Teki <[email protected]>
 R:	Jonas Karlman <[email protected]>
 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
+F:	arch/arm/dts/rk3566-radxa-cm3-io*
 
 RADXA-E25
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/radxa-e25-rk3568_defconfig
-F:	arch/arm/dts/rk3568-radxa-cm3i.dtsi
-F:	arch/arm/dts/rk3568-radxa-e25.dts
-F:	arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+F:	arch/arm/dts/rk3568-radxa-e25*
 
 ROCK-3A
 M:	Akash Gajjar <[email protected]>
 R:	Jonas Karlman <[email protected]>
 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
+F:	arch/arm/dts/rk3568-rock-3a*
 
 ROCK-3B
 M:	Jonas Karlman <[email protected]>
@@ -94,11 +82,11 @@ ROCK-3C
 M:	Jonas Karlman <[email protected]>
 M:	Maxim Moskalets <[email protected]>
 S:	Maintained
-F:	arch/arm/dts/rk3566-rock-3c-u-boot.dtsi
+F:	arch/arm/dts/rk3566-rock-3c*
 F:	configs/rock-3c-rk3566_defconfig
 
 LCKFB-TaishanPi
 M:	Jiehui He <[email protected]>
 S:	Maintained
 F:	configs/lckfb-tspi-rk3566_defconfig
-F:	arch/arm/dts/rk3566-lckfb-tspi-u-boot.dtsi
+F:	arch/arm/dts/rk3566-lckfb-tspi*
board/rockchip/evb_rk3588/MAINTAINERS +7 -14
index 8b11db43f5f6..b64dd4947ee2 100644
@@ -2,16 +2,13 @@ COOLPI-4B-RK3588S
 M:	Andy Yan <[email protected]>
 S:	Maintained
 F:	configs/coolpi-4b-rk3588s_defconfig
-F:	arch/arm/dts/rk3588s-coolpi-4b.dts
-F:	arch/arm/dts/rk3588s-coolpi-u-boot.dtsi
+F:	arch/arm/dts/rk3588s-coolpi-4b*
 
 COOLPI-CM5-EVB-RK3588
 M:	Andy Yan <[email protected]>
 S:	Maintained
 F:	configs/coolpi-cm5-evb-rk3588_defconfig
-F:	arch/arm/dts/rk3588-coolpi-cm5.dtsi
-F:	arch/arm/dts/rk3588-coolpi-cm5-evb.dts
-F:	arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
+F:	arch/arm/dts/rk3588-coolpi-cm5-evb*
 
 EVB-RK3588
 M:	Kever Yang <[email protected]>
@@ -19,15 +16,13 @@ S:	Maintained
 F:	board/rockchip/evb_rk3588
 F:	include/configs/evb_rk3588.h
 F:	configs/evb-rk3588_defconfig
-F:	arch/arm/dts/rk3588-evb1-v10.dts
-F:	arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi
+F:	arch/arm/dts/rk3588-evb1-v10*
 
 GENERIC-RK3588
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/generic-rk3588_defconfig
-F:	arch/arm/dts/rk3588-generic.dts
-F:	arch/arm/dts/rk3588-generic-u-boot.dtsi
+F:	arch/arm/dts/rk3588-generic*
 
 MNT-REFORM2-RK3588
 M:	Peter Robinson <[email protected]>
@@ -38,24 +33,22 @@ ORANGEPI-5-RK3588
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/orangepi-5-rk3588s_defconfig
-F:	arch/arm/dts/rk3588s-orangepi-5.dts
 F:	arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
 
 ORANGEPI-5-MAX-RK3588
 M:	Ilya Katsnelson <[email protected]>
 S:	Maintained
 F:	configs/orangepi-5-max-rk3588_defconfig
-F:	arch/arm/dts/rk3588-orangepi-5-max-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-max*
 
 ORANGEPI-5-PLUS-RK3588
 M:	Jonas Karlman <[email protected]>
 S:	Maintained
 F:	configs/orangepi-5-plus-rk3588_defconfig
-F:	arch/arm/dts/rk3588-orangepi-5-plus.dts
-F:	arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-plus*
 
 ORANGEPI-5-RK3588-ULTRA
 M:	Niu Zhihong <[email protected]>
 S:	Maintained
 F:	configs/orangepi-5-ultra-rk3588_defconfig
-F:	arch/arm/dts/rk3588-orangepi-5-ultra-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-ultra*
board/rockchip/toybrick_rk3588/MAINTAINERS +1 -2
index cd4401c24f30..e2c76f80e9b8 100644
@@ -4,5 +4,4 @@ S:	Maintained
 F:	board/rockchip/toybrick_rk3588
 F:	include/configs/toybrick_rk3588.h
 F:	configs/toybrick-rk3588_defconfig
-F:	arch/arm/dts/rk3588-toybrick-x0.dts
-F:	arch/arm/dts/rk3588-toybrick-x0-u-boot.dtsi
+F:	arch/arm/dts/rk3588-toybrick-x0*
board/turing/turing-rk1-rk3588/MAINTAINERS +1 -3
index 4f313732fa13..973ac68836cb 100644
@@ -4,6 +4,4 @@ S:	Maintained
 F:	board/turing/turing-rk1-rk3588
 F:	include/configs/turing-rk1-rk3588.h
 F:	configs/turing-rk1-rk3588_defconfig
-F:	arch/arm/dts/rk3588-turing-rk1.dts
-F:	arch/arm/dts/rk3588-turing-rk1.dtsi
-F:	arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+F:	arch/arm/dts/rk3588-turing-rk1*
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS +1 -1
index be9c93f6b9d9..79981aa43f13 100644
@@ -3,4 +3,4 @@ M:	Niu Zhihong <[email protected]>
 S:	Maintained
 F:	board/xunlong/orangepi-5-rk3588-ultra
 F:	configs/orangepi-5-ultra-rk3588_defconfig
-F:	arch/arm/dts/rk3588-orangepi-5-ultra.dts
+F:	arch/arm/dts/rk3588-orangepi-5-ultra*

--
2.39.5

Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Johan Jonker

Most Rockchip boards are now using the upstream device tree. Some MAINTAINERS files still contain a reference to no longer available files. Update and where possible streamline with '*' ending.

Quoted 428 lines
---
 .../neural-compute-module-6/MAINTAINERS       |  8 +---
 board/hardkernel/odroid_m1/MAINTAINERS        |  3 +-
 board/khadas/khadas-edge2-rk3588s/MAINTAINERS |  2 +-
 board/pine64/quartz64_rk3566/MAINTAINERS      | 21 ++--------
 board/pine64/quartzpro64-rk3588/MAINTAINERS   |  3 +-
 board/radxa/rock5a-rk3588s/MAINTAINERS        |  3 +-
 board/rockchip/evb_rk3328/MAINTAINERS         | 14 ++-----
 board/rockchip/evb_rk3399/MAINTAINERS         |  7 +---
 board/rockchip/evb_rk3568/MAINTAINERS         | 38 +++++++------------
 board/rockchip/evb_rk3588/MAINTAINERS         | 21 ++++------
 board/rockchip/toybrick_rk3588/MAINTAINERS    |  3 +-
 board/turing/turing-rk1-rk3588/MAINTAINERS    |  4 +-
 .../orangepi-5-ultra-rk3588/MAINTAINERS       |  2 +-
 13 files changed, 37 insertions(+), 92 deletions(-)
board/edgeble/neural-compute-module-6/MAINTAINERS +2 -6
index 42e5df506bf3..97d8c96ae628 100644
@@ -5,9 +5,5 @@ 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
+F:     arch/arm/dts/rk3588-edgeble-neu6a-io*
+F:     arch/arm/dts/rk3588-edgeble-neu6b-io*
board/hardkernel/odroid_m1/MAINTAINERS +1 -2
index 165d2d96741d..8686a552d1c6 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/hardkernel/odroid_m1/
 F:     include/configs/odroid_m1.h
 F:     configs/odroid-m1-rk3568_defconfig
-F:     arch/arm/dts/rk3568-odroid-m1.dts
-F:     arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+F:     arch/arm/dts/rk3568-odroid-m1*
board/khadas/khadas-edge2-rk3588s/MAINTAINERS +1 -1
index 3f16923b0f25..c43f469589dd 100644
@@ -3,4 +3,4 @@ M:      Jacobe Zang <[email protected]>
 S:     Maintained
 F:     configs/khadas-edge2-rk3588s_defconfig
 F:     include/configs/khadas-edge2-rk3588s.h
-F:     dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
\ No newline at end of file
+F:     arch/arm/dts/rk3588s-khadas-edge2*
board/pine64/quartz64_rk3566/MAINTAINERS +3 -18
index 37b8c1eb78b6..955cb5de0300 100644
@@ -9,26 +9,11 @@ F:    configs/quartz64-b-rk3566_defconfig
 F:     configs/soquartz-blade-rk3566_defconfig
 F:     configs/soquartz-cm4-rk3566_defconfig
 F:     configs/soquartz-model-a-rk3566_defconfig
-F:     arch/arm/dts/rk3566-quartz64-a.dts
-F:     arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
-F:     arch/arm/dts/rk3566-quartz64-b.dts
-F:     arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz.dtsi
-F:     arch/arm/dts/rk3566-soquartz-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-blade.dts
-F:     arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-cm4.dts
-F:     arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-model-a.dts
-F:     arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi
+F:     arch/arm/dts/rk3566-quartz64*
+F:     arch/arm/dts/rk3566-soquartz*
 
 PINETAB2-RK3566
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/pinetab2-rk3566_defconfig
-F:     arch/arm/dts/rk3566-pinetab2.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-v0.1.dts
-F:     arch/arm/dts/rk3566-pinetab2-v0.1-u-boot.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-v2.0.dts
-F:     arch/arm/dts/rk3566-pinetab2-v2.0-u-boot.dtsi
+F:     arch/arm/dts/rk3566-pinetab2*
board/pine64/quartzpro64-rk3588/MAINTAINERS +1 -2
index a7e944b74781..ff3500a32fc0 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/pine64/quartzpro64-rk3588
 F:     include/configs/quartzpro64-rk3588.h
 F:     configs/quartzpro64-rk3588_defconfig
-F:     arch/arm/dts/rk3588-quartzpro64.dts
-F:     arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+F:     arch/arm/dts/rk3588-quartzpro64*
board/radxa/rock5a-rk3588s/MAINTAINERS +1 -2
index afc9bf5706c9..d4cd82139d51 100644
@@ -5,5 +5,4 @@ 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
+F:     arch/arm/dts/rk3588s-rock-5a*
board/rockchip/evb_rk3328/MAINTAINERS +3 -11
index 8c9b42fe2bbf..d8748c1c2a26 100644
@@ -4,8 +4,7 @@ S:      Maintained
 F:      board/rockchip/evb_rk3328
 F:      include/configs/evb_rk3328.h
 F:      configs/evb-rk3328_defconfig
-F:      arch/arm/dts/rk3328-evb.dts
-F:      arch/arm/dts/rk3328-evb-u-boot.dtsi
+F:      arch/arm/dts/rk3328-evb*
 
 GENERIC-RK3328
 M:     Jonas Karlman <[email protected]>
@@ -17,14 +16,12 @@ NANOPI-R2C-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
 
 NANOPI-R2C-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c-plus.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
 
 NANOPI-R2S-RK3328
@@ -32,7 +29,6 @@ M:      David Bauer <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2s-rk3328_defconfig
 F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-F:      arch/arm/dts/rk3328-nanopi-r2s.dts
 
 NANOPI-R2S-PLUS-RK3328
 M:      Jonas Karlman <[email protected]>
@@ -44,14 +40,12 @@ ORANGEPI-R1-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
 
 ORANGEPI-R1-PLUS-LTS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-lts-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
 
 ROC-RK3328-CC
@@ -60,16 +54,14 @@ M:      Chen-Yu Tsai <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/roc-cc-rk3328_defconfig
-F:      arch/arm/dts/rk3328-roc-cc.dts
-F:      arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+F:      arch/arm/dts/rk3328-roc-cc*
 
 ROCK64-RK3328
 M:      Matwey V. Kornilov <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/rock64-rk3328_defconfig
-F:      arch/arm/dts/rk3328-rock64.dts
-F:      arch/arm/dts/rk3328-rock64-u-boot.dtsi
+F:      arch/arm/dts/rk3328-rock64*
 
 ROCKPIE-RK3328
 M:      Banglang Huang <[email protected]>
board/rockchip/evb_rk3399/MAINTAINERS +2 -5
index 8319db2e976c..860dd0287597 100644
@@ -24,9 +24,7 @@ KHADAS-EDGE
 M:     Nick Xie <[email protected]>
 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
+F:     arch/arm/dts/rk3399-khadas-edge*
 
 KHADAS-EDGE-CAPTAIN
 M:     Nick Xie <[email protected]>
@@ -56,8 +54,7 @@ NANOPI-M4
 M:     Jagan Teki <[email protected]>
 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
+F:     arch/arm/dts/rk3399-nanopi-m4*
 
 NANOPI-M4-2GB
 M:     Jagan Teki <[email protected]>
board/rockchip/evb_rk3568/MAINTAINERS +13 -25
index 030cdbe6f3db..7e17a6a987a5 100644
@@ -2,8 +2,7 @@ BANANAPI-BPI-R2-PRO
 M:     Frank Wunderlich <[email protected]>
 S:     Maintained
 F:     configs/bpi-r2-pro-rk3568_defconfig
-F:     arch/arm/dts/rk3568-bpi-r2-pro.dts
-F:     arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
+F:     arch/arm/dts/rk3568-bpi-r2-pro*
 
 EVB-RK3568
 M:     Joseph Chen <[email protected]>
@@ -11,78 +10,67 @@ 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
+F:     arch/arm/dts/rk3568-evb*
 
 FASTRHINO-R66S-RK3568
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/fastrhino-r66s-rk3568_defconfig
-F:     arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
+F:     arch/arm/dts/rk3568-fastrhino-r66s*
 
 GENERIC-RK3568
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/generic-rk3568_defconfig
-F:     arch/arm/dts/rk3568-generic.dts
-F:     arch/arm/dts/rk3568-generic-u-boot.dtsi
+F:     arch/arm/dts/rk3568-generic*
 
 LUBANCAT-2
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/lubancat-2-rk3568_defconfig
-F:     arch/arm/dts/rk3568-lubancat-2.dts
-F:     arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+F:     arch/arm/dts/rk3568-lubancat-2*
 
 NANOPI-R3S
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/nanopi-r3s-rk3566_defconfig
-F:     arch/arm/dts/rk3566-nanopi-r3s-u-boot.dtsi
+F:     arch/arm/dts/rk3566-nanopi-r3s*
 
 NANOPI-R5C
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-nanopi-r5c*
 
 NANOPI-R5S
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-nanopi-r5s*
 
 RADXA-CM3-IO
 M:     Jagan Teki <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3566-radxa-cm3-io*
 
 RADXA-E25
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/radxa-e25-rk3568_defconfig
-F:     arch/arm/dts/rk3568-radxa-cm3i.dtsi
-F:     arch/arm/dts/rk3568-radxa-e25.dts
-F:     arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+F:     arch/arm/dts/rk3568-radxa-e25*
 
 ROCK-3A
 M:     Akash Gajjar <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-rock-3a*
 
 ROCK-3B
 M:     Jonas Karlman <[email protected]>
@@ -94,11 +82,11 @@ ROCK-3C
 M:     Jonas Karlman <[email protected]>
 M:     Maxim Moskalets <[email protected]>
 S:     Maintained
-F:     arch/arm/dts/rk3566-rock-3c-u-boot.dtsi
+F:     arch/arm/dts/rk3566-rock-3c*
 F:     configs/rock-3c-rk3566_defconfig
 
 LCKFB-TaishanPi
 M:     Jiehui He <[email protected]>
 S:     Maintained
 F:     configs/lckfb-tspi-rk3566_defconfig
-F:     arch/arm/dts/rk3566-lckfb-tspi-u-boot.dtsi
+F:     arch/arm/dts/rk3566-lckfb-tspi*
board/rockchip/evb_rk3588/MAINTAINERS +7 -14
index 8b11db43f5f6..b64dd4947ee2 100644
@@ -2,16 +2,13 @@ COOLPI-4B-RK3588S
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/coolpi-4b-rk3588s_defconfig
-F:     arch/arm/dts/rk3588s-coolpi-4b.dts
-F:     arch/arm/dts/rk3588s-coolpi-u-boot.dtsi
+F:     arch/arm/dts/rk3588s-coolpi-4b*
 
 COOLPI-CM5-EVB-RK3588
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/coolpi-cm5-evb-rk3588_defconfig
-F:     arch/arm/dts/rk3588-coolpi-cm5.dtsi
-F:     arch/arm/dts/rk3588-coolpi-cm5-evb.dts
-F:     arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
+F:     arch/arm/dts/rk3588-coolpi-cm5-evb*
 
 EVB-RK3588
 M:     Kever Yang <[email protected]>
@@ -19,15 +16,13 @@ S:  Maintained
 F:     board/rockchip/evb_rk3588
 F:     include/configs/evb_rk3588.h
 F:     configs/evb-rk3588_defconfig
-F:     arch/arm/dts/rk3588-evb1-v10.dts
-F:     arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi
+F:     arch/arm/dts/rk3588-evb1-v10*
 
 GENERIC-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/generic-rk3588_defconfig
-F:     arch/arm/dts/rk3588-generic.dts
-F:     arch/arm/dts/rk3588-generic-u-boot.dtsi
+F:     arch/arm/dts/rk3588-generic*
 
 MNT-REFORM2-RK3588
 M:     Peter Robinson <[email protected]>
@@ -38,24 +33,22 @@ ORANGEPI-5-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-rk3588s_defconfig
-F:     arch/arm/dts/rk3588s-orangepi-5.dts
 F:     arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
 
 ORANGEPI-5-MAX-RK3588
 M:     Ilya Katsnelson <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-max-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-max-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-max*
 
 ORANGEPI-5-PLUS-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-plus-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-plus.dts
-F:     arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-plus*
 
 ORANGEPI-5-RK3588-ULTRA
 M:     Niu Zhihong <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-ultra-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-ultra-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-ultra*
board/rockchip/toybrick_rk3588/MAINTAINERS +1 -2
index cd4401c24f30..e2c76f80e9b8 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/rockchip/toybrick_rk3588
 F:     include/configs/toybrick_rk3588.h
 F:     configs/toybrick-rk3588_defconfig
-F:     arch/arm/dts/rk3588-toybrick-x0.dts
-F:     arch/arm/dts/rk3588-toybrick-x0-u-boot.dtsi
+F:     arch/arm/dts/rk3588-toybrick-x0*
board/turing/turing-rk1-rk3588/MAINTAINERS +1 -3
index 4f313732fa13..973ac68836cb 100644
@@ -4,6 +4,4 @@ S:      Maintained
 F:     board/turing/turing-rk1-rk3588
 F:     include/configs/turing-rk1-rk3588.h
 F:     configs/turing-rk1-rk3588_defconfig
-F:     arch/arm/dts/rk3588-turing-rk1.dts
-F:     arch/arm/dts/rk3588-turing-rk1.dtsi
-F:     arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+F:     arch/arm/dts/rk3588-turing-rk1*
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS +1 -2
index be9c93f6b9d9..79981aa43f13 100644
@@ -3,4 +3,4 @@ M:      Niu Zhihong <[email protected]>
 S:     Maintained
 F:     board/xunlong/orangepi-5-rk3588-ultra
 F:     configs/orangepi-5-ultra-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-ultra.dts
+F:     arch/arm/dts/rk3588-orangepi-5-ultra*
--

2.39.5

Acked-by on v1 1/1
#2 lore raw
In reply to Johan Jonker

пн, 18 мая 2026 г. в 02:24, Johan Jonker <[email protected]>:

Quoted 435 lines

Most Rockchip boards are now using the upstream device tree. Some MAINTAINERS files still contain a reference to no longer available files. Update and where possible streamline with '*' ending.

---
 .../neural-compute-module-6/MAINTAINERS       |  8 +---
 board/hardkernel/odroid_m1/MAINTAINERS        |  3 +-
 board/khadas/khadas-edge2-rk3588s/MAINTAINERS |  2 +-
 board/pine64/quartz64_rk3566/MAINTAINERS      | 21 ++--------
 board/pine64/quartzpro64-rk3588/MAINTAINERS   |  3 +-
 board/radxa/rock5a-rk3588s/MAINTAINERS        |  3 +-
 board/rockchip/evb_rk3328/MAINTAINERS         | 14 ++-----
 board/rockchip/evb_rk3399/MAINTAINERS         |  7 +---
 board/rockchip/evb_rk3568/MAINTAINERS         | 38 +++++++------------
 board/rockchip/evb_rk3588/MAINTAINERS         | 21 ++++------
 board/rockchip/toybrick_rk3588/MAINTAINERS    |  3 +-
 board/turing/turing-rk1-rk3588/MAINTAINERS    |  4 +-
 .../orangepi-5-ultra-rk3588/MAINTAINERS       |  2 +-
 13 files changed, 37 insertions(+), 92 deletions(-)
board/edgeble/neural-compute-module-6/MAINTAINERS +2 -6
index 42e5df506bf3..97d8c96ae628 100644
@@ -5,9 +5,5 @@ 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
+F:     arch/arm/dts/rk3588-edgeble-neu6a-io*
+F:     arch/arm/dts/rk3588-edgeble-neu6b-io*
board/hardkernel/odroid_m1/MAINTAINERS +1 -2
index 165d2d96741d..8686a552d1c6 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/hardkernel/odroid_m1/
 F:     include/configs/odroid_m1.h
 F:     configs/odroid-m1-rk3568_defconfig
-F:     arch/arm/dts/rk3568-odroid-m1.dts
-F:     arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+F:     arch/arm/dts/rk3568-odroid-m1*
board/khadas/khadas-edge2-rk3588s/MAINTAINERS +1 -1
index 3f16923b0f25..c43f469589dd 100644
@@ -3,4 +3,4 @@ M:      Jacobe Zang <[email protected]>
 S:     Maintained
 F:     configs/khadas-edge2-rk3588s_defconfig
 F:     include/configs/khadas-edge2-rk3588s.h
-F:     dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
\ No newline at end of file
+F:     arch/arm/dts/rk3588s-khadas-edge2*
board/pine64/quartz64_rk3566/MAINTAINERS +3 -18
index 37b8c1eb78b6..955cb5de0300 100644
@@ -9,26 +9,11 @@ F:    configs/quartz64-b-rk3566_defconfig
 F:     configs/soquartz-blade-rk3566_defconfig
 F:     configs/soquartz-cm4-rk3566_defconfig
 F:     configs/soquartz-model-a-rk3566_defconfig
-F:     arch/arm/dts/rk3566-quartz64-a.dts
-F:     arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
-F:     arch/arm/dts/rk3566-quartz64-b.dts
-F:     arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz.dtsi
-F:     arch/arm/dts/rk3566-soquartz-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-blade.dts
-F:     arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-cm4.dts
-F:     arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi
-F:     arch/arm/dts/rk3566-soquartz-model-a.dts
-F:     arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi
+F:     arch/arm/dts/rk3566-quartz64*
+F:     arch/arm/dts/rk3566-soquartz*
 
 PINETAB2-RK3566
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/pinetab2-rk3566_defconfig
-F:     arch/arm/dts/rk3566-pinetab2.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-v0.1.dts
-F:     arch/arm/dts/rk3566-pinetab2-v0.1-u-boot.dtsi
-F:     arch/arm/dts/rk3566-pinetab2-v2.0.dts
-F:     arch/arm/dts/rk3566-pinetab2-v2.0-u-boot.dtsi
+F:     arch/arm/dts/rk3566-pinetab2*
board/pine64/quartzpro64-rk3588/MAINTAINERS +1 -2
index a7e944b74781..ff3500a32fc0 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/pine64/quartzpro64-rk3588
 F:     include/configs/quartzpro64-rk3588.h
 F:     configs/quartzpro64-rk3588_defconfig
-F:     arch/arm/dts/rk3588-quartzpro64.dts
-F:     arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+F:     arch/arm/dts/rk3588-quartzpro64*
board/radxa/rock5a-rk3588s/MAINTAINERS +1 -2
index afc9bf5706c9..d4cd82139d51 100644
@@ -5,5 +5,4 @@ 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
+F:     arch/arm/dts/rk3588s-rock-5a*
board/rockchip/evb_rk3328/MAINTAINERS +3 -11
index 8c9b42fe2bbf..d8748c1c2a26 100644
@@ -4,8 +4,7 @@ S:      Maintained
 F:      board/rockchip/evb_rk3328
 F:      include/configs/evb_rk3328.h
 F:      configs/evb-rk3328_defconfig
-F:      arch/arm/dts/rk3328-evb.dts
-F:      arch/arm/dts/rk3328-evb-u-boot.dtsi
+F:      arch/arm/dts/rk3328-evb*
 
 GENERIC-RK3328
 M:     Jonas Karlman <[email protected]>
@@ -17,14 +16,12 @@ NANOPI-R2C-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
 
 NANOPI-R2C-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2c-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-nanopi-r2c-plus.dts
 F:      arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
 
 NANOPI-R2S-RK3328
@@ -32,7 +29,6 @@ M:      David Bauer <[email protected]>
 S:      Maintained
 F:      configs/nanopi-r2s-rk3328_defconfig
 F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-F:      arch/arm/dts/rk3328-nanopi-r2s.dts
 
 NANOPI-R2S-PLUS-RK3328
 M:      Jonas Karlman <[email protected]>
@@ -44,14 +40,12 @@ ORANGEPI-R1-PLUS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
 
 ORANGEPI-R1-PLUS-LTS-RK3328
 M:      Tianling Shen <[email protected]>
 S:      Maintained
 F:      configs/orangepi-r1-plus-lts-rk3328_defconfig
-F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
 F:      arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
 
 ROC-RK3328-CC
@@ -60,16 +54,14 @@ M:      Chen-Yu Tsai <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/roc-cc-rk3328_defconfig
-F:      arch/arm/dts/rk3328-roc-cc.dts
-F:      arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+F:      arch/arm/dts/rk3328-roc-cc*
 
 ROCK64-RK3328
 M:      Matwey V. Kornilov <[email protected]>
 R:      Jonas Karlman <[email protected]>
 S:      Maintained
 F:      configs/rock64-rk3328_defconfig
-F:      arch/arm/dts/rk3328-rock64.dts
-F:      arch/arm/dts/rk3328-rock64-u-boot.dtsi
+F:      arch/arm/dts/rk3328-rock64*
 
 ROCKPIE-RK3328
 M:      Banglang Huang <[email protected]>
board/rockchip/evb_rk3399/MAINTAINERS +2 -5
index 8319db2e976c..860dd0287597 100644
@@ -24,9 +24,7 @@ KHADAS-EDGE
 M:     Nick Xie <[email protected]>
 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
+F:     arch/arm/dts/rk3399-khadas-edge*
 
 KHADAS-EDGE-CAPTAIN
 M:     Nick Xie <[email protected]>
@@ -56,8 +54,7 @@ NANOPI-M4
 M:     Jagan Teki <[email protected]>
 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
+F:     arch/arm/dts/rk3399-nanopi-m4*
 
 NANOPI-M4-2GB
 M:     Jagan Teki <[email protected]>
board/rockchip/evb_rk3568/MAINTAINERS +13 -25
index 030cdbe6f3db..7e17a6a987a5 100644
@@ -2,8 +2,7 @@ BANANAPI-BPI-R2-PRO
 M:     Frank Wunderlich <[email protected]>
 S:     Maintained
 F:     configs/bpi-r2-pro-rk3568_defconfig
-F:     arch/arm/dts/rk3568-bpi-r2-pro.dts
-F:     arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
+F:     arch/arm/dts/rk3568-bpi-r2-pro*
 
 EVB-RK3568
 M:     Joseph Chen <[email protected]>
@@ -11,78 +10,67 @@ 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
+F:     arch/arm/dts/rk3568-evb*
 
 FASTRHINO-R66S-RK3568
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/fastrhino-r66s-rk3568_defconfig
-F:     arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
+F:     arch/arm/dts/rk3568-fastrhino-r66s*
 
 GENERIC-RK3568
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/generic-rk3568_defconfig
-F:     arch/arm/dts/rk3568-generic.dts
-F:     arch/arm/dts/rk3568-generic-u-boot.dtsi
+F:     arch/arm/dts/rk3568-generic*
 
 LUBANCAT-2
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/lubancat-2-rk3568_defconfig
-F:     arch/arm/dts/rk3568-lubancat-2.dts
-F:     arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+F:     arch/arm/dts/rk3568-lubancat-2*
 
 NANOPI-R3S
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/nanopi-r3s-rk3566_defconfig
-F:     arch/arm/dts/rk3566-nanopi-r3s-u-boot.dtsi
+F:     arch/arm/dts/rk3566-nanopi-r3s*
 
 NANOPI-R5C
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-nanopi-r5c*
 
 NANOPI-R5S
 M:     Tianling Shen <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-nanopi-r5s*
 
 RADXA-CM3-IO
 M:     Jagan Teki <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3566-radxa-cm3-io*
 
 RADXA-E25
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/radxa-e25-rk3568_defconfig
-F:     arch/arm/dts/rk3568-radxa-cm3i.dtsi
-F:     arch/arm/dts/rk3568-radxa-e25.dts
-F:     arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+F:     arch/arm/dts/rk3568-radxa-e25*
 
 ROCK-3A
 M:     Akash Gajjar <[email protected]>
 R:     Jonas Karlman <[email protected]>
 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
+F:     arch/arm/dts/rk3568-rock-3a*
 
 ROCK-3B
 M:     Jonas Karlman <[email protected]>
@@ -94,11 +82,11 @@ ROCK-3C
 M:     Jonas Karlman <[email protected]>
 M:     Maxim Moskalets <[email protected]>
 S:     Maintained
-F:     arch/arm/dts/rk3566-rock-3c-u-boot.dtsi
+F:     arch/arm/dts/rk3566-rock-3c*
 F:     configs/rock-3c-rk3566_defconfig
 
 LCKFB-TaishanPi
 M:     Jiehui He <[email protected]>
 S:     Maintained
 F:     configs/lckfb-tspi-rk3566_defconfig
-F:     arch/arm/dts/rk3566-lckfb-tspi-u-boot.dtsi
+F:     arch/arm/dts/rk3566-lckfb-tspi*
board/rockchip/evb_rk3588/MAINTAINERS +7 -14
index 8b11db43f5f6..b64dd4947ee2 100644
@@ -2,16 +2,13 @@ COOLPI-4B-RK3588S
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/coolpi-4b-rk3588s_defconfig
-F:     arch/arm/dts/rk3588s-coolpi-4b.dts
-F:     arch/arm/dts/rk3588s-coolpi-u-boot.dtsi
+F:     arch/arm/dts/rk3588s-coolpi-4b*
 
 COOLPI-CM5-EVB-RK3588
 M:     Andy Yan <[email protected]>
 S:     Maintained
 F:     configs/coolpi-cm5-evb-rk3588_defconfig
-F:     arch/arm/dts/rk3588-coolpi-cm5.dtsi
-F:     arch/arm/dts/rk3588-coolpi-cm5-evb.dts
-F:     arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
+F:     arch/arm/dts/rk3588-coolpi-cm5-evb*
 
 EVB-RK3588
 M:     Kever Yang <[email protected]>
@@ -19,15 +16,13 @@ S:  Maintained
 F:     board/rockchip/evb_rk3588
 F:     include/configs/evb_rk3588.h
 F:     configs/evb-rk3588_defconfig
-F:     arch/arm/dts/rk3588-evb1-v10.dts
-F:     arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi
+F:     arch/arm/dts/rk3588-evb1-v10*
 
 GENERIC-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/generic-rk3588_defconfig
-F:     arch/arm/dts/rk3588-generic.dts
-F:     arch/arm/dts/rk3588-generic-u-boot.dtsi
+F:     arch/arm/dts/rk3588-generic*
 
 MNT-REFORM2-RK3588
 M:     Peter Robinson <[email protected]>
@@ -38,24 +33,22 @@ ORANGEPI-5-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-rk3588s_defconfig
-F:     arch/arm/dts/rk3588s-orangepi-5.dts
 F:     arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
 
 ORANGEPI-5-MAX-RK3588
 M:     Ilya Katsnelson <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-max-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-max-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-max*
 
 ORANGEPI-5-PLUS-RK3588
 M:     Jonas Karlman <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-plus-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-plus.dts
-F:     arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-plus*
 
 ORANGEPI-5-RK3588-ULTRA
 M:     Niu Zhihong <[email protected]>
 S:     Maintained
 F:     configs/orangepi-5-ultra-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-ultra-u-boot.dtsi
+F:     arch/arm/dts/rk3588-orangepi-5-ultra*
board/rockchip/toybrick_rk3588/MAINTAINERS +1 -2
index cd4401c24f30..e2c76f80e9b8 100644
@@ -4,5 +4,4 @@ S:      Maintained
 F:     board/rockchip/toybrick_rk3588
 F:     include/configs/toybrick_rk3588.h
 F:     configs/toybrick-rk3588_defconfig
-F:     arch/arm/dts/rk3588-toybrick-x0.dts
-F:     arch/arm/dts/rk3588-toybrick-x0-u-boot.dtsi
+F:     arch/arm/dts/rk3588-toybrick-x0*
board/turing/turing-rk1-rk3588/MAINTAINERS +1 -3
index 4f313732fa13..973ac68836cb 100644
@@ -4,6 +4,4 @@ S:      Maintained
 F:     board/turing/turing-rk1-rk3588
 F:     include/configs/turing-rk1-rk3588.h
 F:     configs/turing-rk1-rk3588_defconfig
-F:     arch/arm/dts/rk3588-turing-rk1.dts
-F:     arch/arm/dts/rk3588-turing-rk1.dtsi
-F:     arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+F:     arch/arm/dts/rk3588-turing-rk1*
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS +1 -2
index be9c93f6b9d9..79981aa43f13 100644
@@ -3,4 +3,4 @@ M:      Niu Zhihong <[email protected]>
 S:     Maintained
 F:     board/xunlong/orangepi-5-rk3588-ultra
 F:     configs/orangepi-5-ultra-rk3588_defconfig
-F:     arch/arm/dts/rk3588-orangepi-5-ultra.dts
+F:     arch/arm/dts/rk3588-orangepi-5-ultra*
--

2.39.5

Signature · 2 lines
With best regards,
Matwey V. Kornilov
Reviewed-by on v1 1/1
#3 lore raw
In reply to Johan Jonker
Quoted 10 lines

2026年5月18日 07:24,Johan Jonker <[email protected]> 写道:

Most Rockchip boards are now using the upstream device tree. Some MAINTAINERS files still contain a reference to no longer available files. Update and where possible streamline with '*' ending.

Reviewed-by Kever Yang <[email protected] <mailto:[email protected]>>

Thanks,
- Kever

Quoted 430 lines

---

.../neural-compute-module-6/MAINTAINERS       |  8 +---
board/hardkernel/odroid_m1/MAINTAINERS        |  3 +-
board/khadas/khadas-edge2-rk3588s/MAINTAINERS |  2 +-
board/pine64/quartz64_rk3566/MAINTAINERS      | 21 ++--------
board/pine64/quartzpro64-rk3588/MAINTAINERS   |  3 +-
board/radxa/rock5a-rk3588s/MAINTAINERS        |  3 +-
board/rockchip/evb_rk3328/MAINTAINERS         | 14 ++-----
board/rockchip/evb_rk3399/MAINTAINERS         |  7 +---
board/rockchip/evb_rk3568/MAINTAINERS         | 38 +++++++------------
board/rockchip/evb_rk3588/MAINTAINERS         | 21 ++++------
board/rockchip/toybrick_rk3588/MAINTAINERS    |  3 +-
board/turing/turing-rk1-rk3588/MAINTAINERS    |  4 +-
.../orangepi-5-ultra-rk3588/MAINTAINERS       |  2 +-
13 files changed, 37 insertions(+), 92 deletions(-)
board/edgeble/neural-compute-module-6/MAINTAINERS +0 -0
index 42e5df506bf3..97d8c96ae628 100644
@@ -5,9 +5,5 @@ 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

board/edgeble/neural-compute-module-6/MAINTAINERS +2 -6
-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
+F:	arch/arm/dts/rk3588-edgeble-neu6a-io*
+F:	arch/arm/dts/rk3588-edgeble-neu6b-io*
board/hardkernel/odroid_m1/MAINTAINERS +0 -0
index 165d2d96741d..8686a552d1c6 100644
@@ -4,5 +4,4 @@ S:	Maintained

F: board/hardkernel/odroid_m1/
F: include/configs/odroid_m1.h
F: configs/odroid-m1-rk3568_defconfig

board/hardkernel/odroid_m1/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-odroid-m1.dts
-F:	arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+F:	arch/arm/dts/rk3568-odroid-m1*
board/khadas/khadas-edge2-rk3588s/MAINTAINERS +0 -0
index 3f16923b0f25..c43f469589dd 100644
@@ -3,4 +3,4 @@ M:	Jacobe Zang <[email protected]>

S: Maintained
F: configs/khadas-edge2-rk3588s_defconfig
F: include/configs/khadas-edge2-rk3588s.h

board/khadas/khadas-edge2-rk3588s/MAINTAINERS +1 -1
-F:	dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
\ No newline at end of file
+F:	arch/arm/dts/rk3588s-khadas-edge2*
board/pine64/quartz64_rk3566/MAINTAINERS +0 -0
index 37b8c1eb78b6..955cb5de0300 100644
@@ -9,26 +9,11 @@ F:	configs/quartz64-b-rk3566_defconfig

F: configs/soquartz-blade-rk3566_defconfig
F: configs/soquartz-cm4-rk3566_defconfig
F: configs/soquartz-model-a-rk3566_defconfig

board/pine64/quartz64_rk3566/MAINTAINERS +2 -12
-F:	arch/arm/dts/rk3566-quartz64-a.dts
-F:	arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
-F:	arch/arm/dts/rk3566-quartz64-b.dts
-F:	arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz.dtsi
-F:	arch/arm/dts/rk3566-soquartz-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-blade.dts
-F:	arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-cm4.dts
-F:	arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi
-F:	arch/arm/dts/rk3566-soquartz-model-a.dts
-F:	arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi
+F:	arch/arm/dts/rk3566-quartz64*
+F:	arch/arm/dts/rk3566-soquartz*

PINETAB2-RK3566
M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/pinetab2-rk3566_defconfig

board/pine64/quartz64_rk3566/MAINTAINERS +1 -6
-F:	arch/arm/dts/rk3566-pinetab2.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-v0.1.dts
-F:	arch/arm/dts/rk3566-pinetab2-v0.1-u-boot.dtsi
-F:	arch/arm/dts/rk3566-pinetab2-v2.0.dts
-F:	arch/arm/dts/rk3566-pinetab2-v2.0-u-boot.dtsi
+F:	arch/arm/dts/rk3566-pinetab2*
board/pine64/quartzpro64-rk3588/MAINTAINERS +0 -0
index a7e944b74781..ff3500a32fc0 100644
@@ -4,5 +4,4 @@ S:	Maintained

F: board/pine64/quartzpro64-rk3588
F: include/configs/quartzpro64-rk3588.h
F: configs/quartzpro64-rk3588_defconfig

board/pine64/quartzpro64-rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-quartzpro64.dts
-F:	arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+F:	arch/arm/dts/rk3588-quartzpro64*
board/radxa/rock5a-rk3588s/MAINTAINERS +0 -0
index afc9bf5706c9..d4cd82139d51 100644
@@ -5,5 +5,4 @@ S:	Maintained

F: board/radxa/rock5a-rk3588s
F: include/configs/rock5a-rk3588s.h
F: configs/rock5a-rk3588s_defconfig

board/radxa/rock5a-rk3588s/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588s-rock-5a.dts
-F:	arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
+F:	arch/arm/dts/rk3588s-rock-5a*
board/rockchip/evb_rk3328/MAINTAINERS +0 -0
index 8c9b42fe2bbf..d8748c1c2a26 100644
@@ -4,8 +4,7 @@ S:      Maintained
F:      board/rockchip/evb_rk3328
F:      include/configs/evb_rk3328.h
F:      configs/evb-rk3328_defconfig
board/rockchip/evb_rk3328/MAINTAINERS +1 -2
-F:      arch/arm/dts/rk3328-evb.dts
-F:      arch/arm/dts/rk3328-evb-u-boot.dtsi
+F:      arch/arm/dts/rk3328-evb*

GENERIC-RK3328
M: Jonas Karlman <[email protected]>

board/rockchip/evb_rk3328/MAINTAINERS +0 -0
@@ -17,14 +16,12 @@ NANOPI-R2C-RK3328
M:      Tianling Shen <[email protected]>
S:      Maintained
F:      configs/nanopi-r2c-rk3328_defconfig

-F: arch/arm/dts/rk3328-nanopi-r2c.dts
F: arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi

NANOPI-R2C-PLUS-RK3328

M:      Tianling Shen <[email protected]>
S:      Maintained
F:      configs/nanopi-r2c-plus-rk3328_defconfig

-F: arch/arm/dts/rk3328-nanopi-r2c-plus.dts
F: arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi

NANOPI-R2S-RK3328

board/rockchip/evb_rk3328/MAINTAINERS +0 -0
@@ -32,7 +29,6 @@ M:      David Bauer <[email protected]>
S:      Maintained
F:      configs/nanopi-r2s-rk3328_defconfig
F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi

-F: arch/arm/dts/rk3328-nanopi-r2s.dts

NANOPI-R2S-PLUS-RK3328
M: Jonas Karlman <[email protected]>

board/rockchip/evb_rk3328/MAINTAINERS +0 -0
@@ -44,14 +40,12 @@ ORANGEPI-R1-PLUS-RK3328
M:      Tianling Shen <[email protected]>
S:      Maintained
F:      configs/orangepi-r1-plus-rk3328_defconfig

-F: arch/arm/dts/rk3328-orangepi-r1-plus.dts
F: arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi

ORANGEPI-R1-PLUS-LTS-RK3328

M:      Tianling Shen <[email protected]>
S:      Maintained
F:      configs/orangepi-r1-plus-lts-rk3328_defconfig

-F: arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
F: arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi

ROC-RK3328-CC

board/rockchip/evb_rk3328/MAINTAINERS +0 -0
@@ -60,16 +54,14 @@ M:      Chen-Yu Tsai <[email protected]>
R:      Jonas Karlman <[email protected]>
S:      Maintained
F:      configs/roc-cc-rk3328_defconfig
board/rockchip/evb_rk3328/MAINTAINERS +1 -2
-F:      arch/arm/dts/rk3328-roc-cc.dts
-F:      arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+F:      arch/arm/dts/rk3328-roc-cc*

ROCK64-RK3328

M:      Matwey V. Kornilov <[email protected]>
R:      Jonas Karlman <[email protected]>
S:      Maintained
F:      configs/rock64-rk3328_defconfig
board/rockchip/evb_rk3328/MAINTAINERS +1 -2
-F:      arch/arm/dts/rk3328-rock64.dts
-F:      arch/arm/dts/rk3328-rock64-u-boot.dtsi
+F:      arch/arm/dts/rk3328-rock64*

ROCKPIE-RK3328
M: Banglang Huang <[email protected]>

board/rockchip/evb_rk3399/MAINTAINERS +0 -0
index 8319db2e976c..860dd0287597 100644
@@ -24,9 +24,7 @@ KHADAS-EDGE

M: Nick Xie <[email protected]>
S: Maintained
F: configs/khadas-edge-rk3399_defconfig

board/rockchip/evb_rk3399/MAINTAINERS +1 -3
-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
+F:	arch/arm/dts/rk3399-khadas-edge*

KHADAS-EDGE-CAPTAIN
M: Nick Xie <[email protected]>

board/rockchip/evb_rk3399/MAINTAINERS +0 -0
@@ -56,8 +54,7 @@ NANOPI-M4

M: Jagan Teki <[email protected]>
S: Maintained
F: configs/nanopi-m4-rk3399_defconfig

board/rockchip/evb_rk3399/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3399-nanopi-m4.dts
-F:	arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi
+F:	arch/arm/dts/rk3399-nanopi-m4*

NANOPI-M4-2GB
M: Jagan Teki <[email protected]>

board/rockchip/evb_rk3568/MAINTAINERS +0 -0
index 030cdbe6f3db..7e17a6a987a5 100644
@@ -2,8 +2,7 @@ BANANAPI-BPI-R2-PRO

M: Frank Wunderlich <[email protected]>
S: Maintained
F: configs/bpi-r2-pro-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-bpi-r2-pro.dts
-F:	arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
+F:	arch/arm/dts/rk3568-bpi-r2-pro*

EVB-RK3568
M: Joseph Chen <[email protected]>

board/rockchip/evb_rk3568/MAINTAINERS +0 -0
@@ -11,78 +10,67 @@ S:	Maintained

F: board/rockchip/evb_rk3568
F: include/configs/evb_rk3568.h
F: configs/evb-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-evb-u-boot.dtsi
-F:	arch/arm/dts/rk3568-evb.dts
+F:	arch/arm/dts/rk3568-evb*

FASTRHINO-R66S-RK3568
M: Tianling Shen <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/fastrhino-r66s-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
+F:	arch/arm/dts/rk3568-fastrhino-r66s*

GENERIC-RK3568
M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/generic-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-generic.dts
-F:	arch/arm/dts/rk3568-generic-u-boot.dtsi
+F:	arch/arm/dts/rk3568-generic*

LUBANCAT-2
M: Andy Yan <[email protected]>
S: Maintained
F: configs/lubancat-2-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-lubancat-2.dts
-F:	arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+F:	arch/arm/dts/rk3568-lubancat-2*

NANOPI-R3S
M: Tianling Shen <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/nanopi-r3s-rk3566_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3566-nanopi-r3s-u-boot.dtsi
+F:	arch/arm/dts/rk3566-nanopi-r3s*

NANOPI-R5C
M: Tianling Shen <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/nanopi-r5c-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-nanopi-r5c.dts
-F:	arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
+F:	arch/arm/dts/rk3568-nanopi-r5c*

NANOPI-R5S
M: Tianling Shen <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/nanopi-r5s-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -3
-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
+F:	arch/arm/dts/rk3568-nanopi-r5s*

RADXA-CM3-IO
M: Jagan Teki <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/radxa-cm3-io-rk3566_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -3
-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
+F:	arch/arm/dts/rk3566-radxa-cm3-io*

RADXA-E25
M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/radxa-e25-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -3
-F:	arch/arm/dts/rk3568-radxa-cm3i.dtsi
-F:	arch/arm/dts/rk3568-radxa-e25.dts
-F:	arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+F:	arch/arm/dts/rk3568-radxa-e25*

ROCK-3A
M: Akash Gajjar <[email protected]>
R: Jonas Karlman <[email protected]>
S: Maintained
F: configs/rock-3a-rk3568_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3568-rock-3a.dts
-F:	arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+F:	arch/arm/dts/rk3568-rock-3a*

ROCK-3B
M: Jonas Karlman <[email protected]>

board/rockchip/evb_rk3568/MAINTAINERS +0 -0
@@ -94,11 +82,11 @@ ROCK-3C

M: Jonas Karlman <[email protected]>
M: Maxim Moskalets <[email protected]>
S: Maintained

board/rockchip/evb_rk3568/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3566-rock-3c-u-boot.dtsi
+F:	arch/arm/dts/rk3566-rock-3c*

F: configs/rock-3c-rk3566_defconfig

LCKFB-TaishanPi
M: Jiehui He <[email protected]>
S: Maintained
F: configs/lckfb-tspi-rk3566_defconfig

board/rockchip/evb_rk3568/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3566-lckfb-tspi-u-boot.dtsi
+F:	arch/arm/dts/rk3566-lckfb-tspi*
board/rockchip/evb_rk3588/MAINTAINERS +0 -0
index 8b11db43f5f6..b64dd4947ee2 100644
@@ -2,16 +2,13 @@ COOLPI-4B-RK3588S

M: Andy Yan <[email protected]>
S: Maintained
F: configs/coolpi-4b-rk3588s_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588s-coolpi-4b.dts
-F:	arch/arm/dts/rk3588s-coolpi-u-boot.dtsi
+F:	arch/arm/dts/rk3588s-coolpi-4b*

COOLPI-CM5-EVB-RK3588
M: Andy Yan <[email protected]>
S: Maintained
F: configs/coolpi-cm5-evb-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -3
-F:	arch/arm/dts/rk3588-coolpi-cm5.dtsi
-F:	arch/arm/dts/rk3588-coolpi-cm5-evb.dts
-F:	arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
+F:	arch/arm/dts/rk3588-coolpi-cm5-evb*

EVB-RK3588
M: Kever Yang <[email protected]>

board/rockchip/evb_rk3588/MAINTAINERS +0 -0
@@ -19,15 +16,13 @@ S:	Maintained

F: board/rockchip/evb_rk3588
F: include/configs/evb_rk3588.h
F: configs/evb-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-evb1-v10.dts
-F:	arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi
+F:	arch/arm/dts/rk3588-evb1-v10*

GENERIC-RK3588
M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/generic-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-generic.dts
-F:	arch/arm/dts/rk3588-generic-u-boot.dtsi
+F:	arch/arm/dts/rk3588-generic*

MNT-REFORM2-RK3588
M: Peter Robinson <[email protected]>

board/rockchip/evb_rk3588/MAINTAINERS +0 -0
@@ -38,24 +33,22 @@ ORANGEPI-5-RK3588

M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/orangepi-5-rk3588s_defconfig
-F: arch/arm/dts/rk3588s-orangepi-5.dts
F: arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi

ORANGEPI-5-MAX-RK3588
M: Ilya Katsnelson <[email protected]>
S: Maintained
F: configs/orangepi-5-max-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3588-orangepi-5-max-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-max*

ORANGEPI-5-PLUS-RK3588
M: Jonas Karlman <[email protected]>
S: Maintained
F: configs/orangepi-5-plus-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-orangepi-5-plus.dts
-F:	arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-plus*

ORANGEPI-5-RK3588-ULTRA
M: Niu Zhihong <[email protected]>
S: Maintained
F: configs/orangepi-5-ultra-rk3588_defconfig

board/rockchip/evb_rk3588/MAINTAINERS +1 -1
-F:	arch/arm/dts/rk3588-orangepi-5-ultra-u-boot.dtsi
+F:	arch/arm/dts/rk3588-orangepi-5-ultra*
board/rockchip/toybrick_rk3588/MAINTAINERS +0 -0
index cd4401c24f30..e2c76f80e9b8 100644
@@ -4,5 +4,4 @@ S:	Maintained

F: board/rockchip/toybrick_rk3588
F: include/configs/toybrick_rk3588.h
F: configs/toybrick-rk3588_defconfig

board/rockchip/toybrick_rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-toybrick-x0.dts
-F:	arch/arm/dts/rk3588-toybrick-x0-u-boot.dtsi
+F:	arch/arm/dts/rk3588-toybrick-x0*
board/turing/turing-rk1-rk3588/MAINTAINERS +0 -0
index 4f313732fa13..973ac68836cb 100644
@@ -4,6 +4,4 @@ S:	Maintained

F: board/turing/turing-rk1-rk3588
F: include/configs/turing-rk1-rk3588.h
F: configs/turing-rk1-rk3588_defconfig

board/turing/turing-rk1-rk3588/MAINTAINERS +1 -3
-F:	arch/arm/dts/rk3588-turing-rk1.dts
-F:	arch/arm/dts/rk3588-turing-rk1.dtsi
-F:	arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+F:	arch/arm/dts/rk3588-turing-rk1*
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS +0 -0
index be9c93f6b9d9..79981aa43f13 100644
@@ -3,4 +3,4 @@ M:	Niu Zhihong <[email protected]>

S: Maintained
F: board/xunlong/orangepi-5-rk3588-ultra
F: configs/orangepi-5-ultra-rk3588_defconfig

board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS +1 -2
-F:	arch/arm/dts/rk3588-orangepi-5-ultra.dts
+F:	arch/arm/dts/rk3588-orangepi-5-ultra*
--

2.39.5