Re: [PATCH v1] rockchip: MAINTAINERS: upstream devicetree update
> 2026年5月18日 07:24，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. > > Signed-off-by: Johan Jonker Reviewed-by: Kever Yang mailto:[email protected]>> Thanks, - Kever > --- > .../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(-) > > diff --git a/board/edgeble/neural-compute-module-6/MAINTAINERS > b/board/edgeble/neural-compute-module-6/MAINTAINERS > index 42e5df506bf3..97d8c96ae628 100644 > --- a/board/edgeble/neural-compute-module-6/MAINTAINERS > +++ b/board/edgeble/neural-compute-module-6/MAINTAINERS > @@ -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* > diff --git a/board/hardkernel/odroid_m1/MAINTAINERS > b/board/hardkernel/odroid_m1/MAINTAINERS > index 165d2d96741d..8686a552d1c6 100644 > --- a/board/hardkernel/odroid_m1/MAINTAINERS > +++ b/board/hardkernel/odroid_m1/MAINTAINERS > @@ -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* > diff --git a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > index 3f16923b0f25..c43f469589dd 100644 > --- a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > +++ b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > @@ -3,4 +3,4 @@ M:Jacobe Zang > 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* > diff --git a/board/pine64/quartz64_rk3566/MAINTAINERS > b/board/pine64/quartz64_rk3566/MAINTAINERS > index 37b8c1eb78b6..955cb5de0300 100644 > --- a/board/pine64/quartz64_rk3566/MAINTAINERS > +++ b/board/pine64/quartz64_rk3566/MAINTAINERS > @@ -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 > 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* > diff --git a/board/pine64/quartzpro64-rk3588/MAINTAINERS > b/board/pine64/quartzpro64-rk3588/MAINTAINERS > index a7e944b74781..ff3500a32fc0 100644 > --- a/board/pine64/quartzpro64-rk3588/MAINTAINERS > +++ b/board/pine64/quartzpro64-rk3588/MAINTAINERS > @@ -4,5 +4,4 @@ S:Maintained > F:board/pine64/quartzpro64-rk3588 > F
Re: [PATCH v1] rockchip: MAINTAINERS: upstream devicetree update
Acked-by: Matwey V. Kornilov пн, 18 мая 2026 г. в 02:24, 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. > > Signed-off-by: Johan Jonker > --- > .../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(-) > > diff --git a/board/edgeble/neural-compute-module-6/MAINTAINERS > b/board/edgeble/neural-compute-module-6/MAINTAINERS > index 42e5df506bf3..97d8c96ae628 100644 > --- a/board/edgeble/neural-compute-module-6/MAINTAINERS > +++ b/board/edgeble/neural-compute-module-6/MAINTAINERS > @@ -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* > diff --git a/board/hardkernel/odroid_m1/MAINTAINERS > b/board/hardkernel/odroid_m1/MAINTAINERS > index 165d2d96741d..8686a552d1c6 100644 > --- a/board/hardkernel/odroid_m1/MAINTAINERS > +++ b/board/hardkernel/odroid_m1/MAINTAINERS > @@ -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* > diff --git a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > index 3f16923b0f25..c43f469589dd 100644 > --- a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > +++ b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > @@ -3,4 +3,4 @@ M: Jacobe Zang > 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* > diff --git a/board/pine64/quartz64_rk3566/MAINTAINERS > b/board/pine64/quartz64_rk3566/MAINTAINERS > index 37b8c1eb78b6..955cb5de0300 100644 > --- a/board/pine64/quartz64_rk3566/MAINTAINERS > +++ b/board/pine64/quartz64_rk3566/MAINTAINERS > @@ -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 > 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* > diff --git a/board/pine64/quartzpro64-rk3588/MAINTAINERS > b/board/pine64/quartzpro64-rk3588/MAINTAINERS > index a7e944b74781..ff3500a32fc0 100644 > --- a/board/pine64/quartzpro64-rk3588/MAINTAINERS > +++ b/board/pine64/quartzpro64-rk3588/MAINTAINERS > @@
Re: [PATCH v1] rockchip: MAINTAINERS: upstream devicetree update
On Mon, 18 May 2026 at 00:33, Johan Jonker wrote: > > 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 Reviewed-by: Peter Robinson > --- > .../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(-) > > diff --git a/board/edgeble/neural-compute-module-6/MAINTAINERS > b/board/edgeble/neural-compute-module-6/MAINTAINERS > index 42e5df506bf3..97d8c96ae628 100644 > --- a/board/edgeble/neural-compute-module-6/MAINTAINERS > +++ b/board/edgeble/neural-compute-module-6/MAINTAINERS > @@ -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* > diff --git a/board/hardkernel/odroid_m1/MAINTAINERS > b/board/hardkernel/odroid_m1/MAINTAINERS > index 165d2d96741d..8686a552d1c6 100644 > --- a/board/hardkernel/odroid_m1/MAINTAINERS > +++ b/board/hardkernel/odroid_m1/MAINTAINERS > @@ -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* > diff --git a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > index 3f16923b0f25..c43f469589dd 100644 > --- a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > +++ b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS > @@ -3,4 +3,4 @@ M: Jacobe Zang > 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* > diff --git a/board/pine64/quartz64_rk3566/MAINTAINERS > b/board/pine64/quartz64_rk3566/MAINTAINERS > index 37b8c1eb78b6..955cb5de0300 100644 > --- a/board/pine64/quartz64_rk3566/MAINTAINERS > +++ b/board/pine64/quartz64_rk3566/MAINTAINERS > @@ -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 > 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* > diff --git a/board/pine64/quartzpro64-rk3588/MAINTAINERS > b/board/pine64/quartzpro64-rk3588/MAINTAINERS > index a7e944b74781..ff3500a32fc0 100644 > --- a/board/pine64/quartzpro64-rk3588/MAINTAINERS > +++ b/board/pine64/quartzpro64-rk3588/MAINTAINER
