]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
rockchip: MAINTAINERS: upstream devicetree update
authorJohan Jonker <jbx6244@gmail.com>
Sun, 17 May 2026 23:24:13 +0000 (01:24 +0200)
committerKever <kever@KeverdeMacBook-Pro.local>
Tue, 9 Jun 2026 16:19:05 +0000 (00:19 +0800)
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.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
13 files changed:
board/edgeble/neural-compute-module-6/MAINTAINERS
board/hardkernel/odroid_m1/MAINTAINERS
board/khadas/khadas-edge2-rk3588s/MAINTAINERS
board/pine64/quartz64_rk3566/MAINTAINERS
board/pine64/quartzpro64-rk3588/MAINTAINERS
board/radxa/rock5a-rk3588s/MAINTAINERS
board/rockchip/evb_rk3328/MAINTAINERS
board/rockchip/evb_rk3399/MAINTAINERS
board/rockchip/evb_rk3568/MAINTAINERS
board/rockchip/evb_rk3588/MAINTAINERS
board/rockchip/toybrick_rk3588/MAINTAINERS
board/turing/turing-rk1-rk3588/MAINTAINERS
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS

index 42e5df506bf3c5c6ea8605262573b750e219131d..97d8c96ae628a73d3a33cc59ea3194e90d931040 100644 (file)
@@ -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*
index 165d2d96741debd3acc7e11e1b96fc3ece0a86b8..8686a552d1c6a0792b3140dc733ae76b5408653c 100644 (file)
@@ -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*
index 3f16923b0f25c70466642e5ac5c4e454a1110fbf..c43f469589ddd270494365d4b63e7376f3ca6887 100644 (file)
@@ -3,4 +3,4 @@ M:      Jacobe Zang <jacobe.zang@wesion.com>
 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*
index 37b8c1eb78b6e4251006cebabf842bd12cea6e36..955cb5de03002b756716c13fd8627046a51be0ae 100644 (file)
@@ -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 <jonas@kwiboo.se>
 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*
index a7e944b74781e6a08bba13c23d22234937907c2c..ff3500a32fc036a9cf14184b9a9e1fdbf64a6d01 100644 (file)
@@ -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*
index afc9bf5706c9486716f01f9e29dcc23334720298..d4cd82139d515c89e35667828d75cd880cf46d6e 100644 (file)
@@ -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*
index 8c9b42fe2bbfe61b6407ec4ab277abdb45e41046..d8748c1c2a26042cdb2089668f12b94cbef60f58 100644 (file)
@@ -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 <jonas@kwiboo.se>
@@ -17,14 +16,12 @@ NANOPI-R2C-RK3328
 M:      Tianling Shen <cnsztl@gmail.com>
 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 <cnsztl@gmail.com>
 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 <mail@david-bauer.net>
 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 <jonas@kwiboo.se>
@@ -44,14 +40,12 @@ ORANGEPI-R1-PLUS-RK3328
 M:      Tianling Shen <cnsztl@gmail.com>
 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 <cnsztl@gmail.com>
 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 <wens@csie.org>
 R:      Jonas Karlman <jonas@kwiboo.se>
 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 <matwey.kornilov@gmail.com>
 R:      Jonas Karlman <jonas@kwiboo.se>
 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 <banglang.huang@foxmail.com>
index 8319db2e976cec502094d433e38948803be84522..860dd02875973e90a6c0705438cdabcce0b70d38 100644 (file)
@@ -24,9 +24,7 @@ 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
+F:     arch/arm/dts/rk3399-khadas-edge*
 
 KHADAS-EDGE-CAPTAIN
 M:     Nick Xie <nick@khadas.com>
@@ -56,8 +54,7 @@ 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
+F:     arch/arm/dts/rk3399-nanopi-m4*
 
 NANOPI-M4-2GB
 M:     Jagan Teki <jagan@amarulasolutions.com>
index 030cdbe6f3db1fe1613346111fa457109237784d..7e17a6a987a585b81694b08b12b36f82d83218a3 100644 (file)
@@ -2,8 +2,7 @@ BANANAPI-BPI-R2-PRO
 M:     Frank Wunderlich <frank-w@public-files.de>
 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 <chenjh@rock-chips.com>
@@ -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 <cnsztl@gmail.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <jonas@kwiboo.se>
 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 <andyshrk@163.com>
 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 <cnsztl@gmail.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <cnsztl@gmail.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <cnsztl@gmail.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <jagan@amarulasolutions.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <jonas@kwiboo.se>
 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 <gajjar04akash@gmail.com>
 R:     Jonas Karlman <jonas@kwiboo.se>
 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 <jonas@kwiboo.se>
@@ -94,11 +82,11 @@ ROCK-3C
 M:     Jonas Karlman <jonas@kwiboo.se>
 M:     Maxim Moskalets <maximmosk4@gmail.com>
 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 <jiehui.he@foxmail.com>
 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*
index 8b11db43f5f645e344d62ae690c8a0baba514c3e..b64dd4947ee2f6d37bf0424222b97243e3519023 100644 (file)
@@ -2,16 +2,13 @@ COOLPI-4B-RK3588S
 M:     Andy Yan <andyshrk@163.com>
 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 <andyshrk@163.com>
 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 <kever.yang@rock-chips.com>
@@ -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 <jonas@kwiboo.se>
 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 <pbrobinson@gmail.com>
@@ -38,24 +33,22 @@ ORANGEPI-5-RK3588
 M:     Jonas Karlman <jonas@kwiboo.se>
 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 <me@0upti.me>
 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 <jonas@kwiboo.se>
 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 <zhihong@nzhnb.com>
 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*
index cd4401c24f30b8512b9178ca5a3e7ba492a1be61..e2c76f80e9b84eb5576bbe8aeba6c74af1a8f674 100644 (file)
@@ -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*
index 4f313732fa13ef795fcdfd00118e78eaf378420f..973ac68836cb0b0768a4d53fc920ff65fdb40604 100644 (file)
@@ -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*
index be9c93f6b9d921c97586bdf21cb05a8035c71d59..79981aa43f1387ee2f115a61d7edf5d56bc452b0 100644 (file)
@@ -3,4 +3,4 @@ M:      Niu Zhihong <zhihong@nzhnb.com>
 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*