Hi Chris, On 2024-05-04 22:51, Chris Morgan wrote: > On Sat, May 04, 2024 at 07:43:01PM +0000, Jonas Karlman wrote: >> Remove redundant device tree files now that RK356x boards have been >> migrated to use OF_UPSTREAM. >> >> Signed-off-by: Jonas Karlman <jo...@kwiboo.se> >> --- >> arch/arm/dts/rk3566-anbernic-rgxx3.dtsi | 788 ------ >> arch/arm/dts/rk3566-quartz64-a.dts | 838 ------ >> arch/arm/dts/rk3566-quartz64-b.dts | 737 ----- >> arch/arm/dts/rk3566-radxa-cm3-io.dts | 281 -- >> arch/arm/dts/rk3566-radxa-cm3.dtsi | 425 --- >> arch/arm/dts/rk3566-soquartz-blade.dts | 198 -- >> arch/arm/dts/rk3566-soquartz-cm4.dts | 196 -- >> arch/arm/dts/rk3566-soquartz-model-a.dts | 236 -- >> arch/arm/dts/rk3566-soquartz.dtsi | 684 ----- >> arch/arm/dts/rk3566.dtsi | 35 - >> arch/arm/dts/rk3568-bpi-r2-pro.dts | 852 ------ >> arch/arm/dts/rk3568-evb.dts | 689 ----- >> arch/arm/dts/rk3568-lubancat-2.dts | 730 ----- >> arch/arm/dts/rk3568-nanopi-r5c.dts | 112 - >> arch/arm/dts/rk3568-nanopi-r5s.dts | 136 - >> arch/arm/dts/rk3568-nanopi-r5s.dtsi | 587 ---- >> arch/arm/dts/rk3568-odroid-m1.dts | 741 ----- >> arch/arm/dts/rk3568-pinctrl.dtsi | 3214 ---------------------- >> arch/arm/dts/rk3568-radxa-cm3i.dtsi | 412 --- >> arch/arm/dts/rk3568-radxa-e25.dts | 236 -- >> arch/arm/dts/rk3568-rock-3a.dts | 859 ------ >> arch/arm/dts/rk3568.dtsi | 267 -- >> arch/arm/dts/rk356x.dtsi | 1886 ------------- >> include/dt-bindings/clock/rk3568-cru.h | 926 ------- >> include/dt-bindings/power/rk3568-power.h | 32 - >> 25 files changed, 16097 deletions(-) >> delete mode 100644 arch/arm/dts/rk3566-anbernic-rgxx3.dtsi >> delete mode 100644 arch/arm/dts/rk3566-quartz64-a.dts >> delete mode 100644 arch/arm/dts/rk3566-quartz64-b.dts >> delete mode 100644 arch/arm/dts/rk3566-radxa-cm3-io.dts >> delete mode 100644 arch/arm/dts/rk3566-radxa-cm3.dtsi >> delete mode 100644 arch/arm/dts/rk3566-soquartz-blade.dts >> delete mode 100644 arch/arm/dts/rk3566-soquartz-cm4.dts >> delete mode 100644 arch/arm/dts/rk3566-soquartz-model-a.dts >> delete mode 100644 arch/arm/dts/rk3566-soquartz.dtsi >> delete mode 100644 arch/arm/dts/rk3566.dtsi >> delete mode 100644 arch/arm/dts/rk3568-bpi-r2-pro.dts >> delete mode 100644 arch/arm/dts/rk3568-evb.dts >> delete mode 100644 arch/arm/dts/rk3568-lubancat-2.dts >> delete mode 100644 arch/arm/dts/rk3568-nanopi-r5c.dts >> delete mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dts >> delete mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dtsi >> delete mode 100644 arch/arm/dts/rk3568-odroid-m1.dts >> delete mode 100644 arch/arm/dts/rk3568-pinctrl.dtsi >> delete mode 100644 arch/arm/dts/rk3568-radxa-cm3i.dtsi >> delete mode 100644 arch/arm/dts/rk3568-radxa-e25.dts >> delete mode 100644 arch/arm/dts/rk3568-rock-3a.dts >> delete mode 100644 arch/arm/dts/rk3568.dtsi >> delete mode 100644 arch/arm/dts/rk356x.dtsi >> delete mode 100644 include/dt-bindings/clock/rk3568-cru.h >> delete mode 100644 include/dt-bindings/power/rk3568-power.h >> >> diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi >> b/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi >> deleted file mode 100644 > > Can we remove this since a non-upstream device tree depends on it?
I was a bit unsure what to do about this file, after this patch it gets included from dts/upstream/ correctly when building the anbernic-rgxx3-rk3566 target. Not sure if it is better to keep a local copy in arch/arm/dts/ and manually sync it, or let it be included from dts/upstream/. Let me know if you want me to keep the copy in arch/arm/dts/. Regards, Jonas > > Thank you, > Chris > [snip]
