Re: [PATCH 4/4] ARM: dts: Move .dts files to vendor sub-directories

From: Geert Uytterhoeven
Date: Fri May 05 2023 - 04:05:01 EST


On Thu, 4 May 2023, Rob Herring wrote:
The arm dts directory has grown to 1553 boards which makes it a bit
unwieldy to maintain and use. Past attempts stalled out due to plans to
move .dts files out of the kernel tree. Doing that is no longer planned
(any time soon at least), so let's go ahead and group .dts files by
vendors. This move aligns arm with arm64 .dts file structure.

Doing this enables building subsets of dts files by vendor easily
without changing kernel configs:

make allyesconfig
make arch/arm/boot/dts/ti/

There's no change to dtbs_install as the flat structure is maintained on
install.

The naming of vendor directories is roughly in this order of preference:
- Matching original and current SoC vendor prefix/name (e.g. ti, qcom)
- Current vendor prefix/name if still actively sold (SoCs which have
been aquired) (e.g. nxp/imx)
- Existing platform name for older platforms not sold/maintained by any
company (e.g. gemini, nspire)

The whole move was scripted with the exception of MAINTAINERS.

Signed-off-by: Rob Herring <robh@xxxxxxxxxx>

arch/arm/boot/dts/renesas/Makefile | 33 +
arch/arm/boot/dts/{ => renesas}/emev2-kzm9d.dts | 0
arch/arm/boot/dts/{ => renesas}/emev2.dtsi | 0
.../{ => renesas}/gr-peach-audiocamerashield.dtsi | 0
.../boot/dts/{ => renesas}/iwg20d-q7-common.dtsi | 0
.../boot/dts/{ => renesas}/iwg20d-q7-dbcm-ca.dtsi | 0
.../arm/boot/dts/{ => renesas}/r7s72100-genmai.dts | 0
.../boot/dts/{ => renesas}/r7s72100-gr-peach.dts | 0
.../boot/dts/{ => renesas}/r7s72100-rskrza1.dts | 0
arch/arm/boot/dts/{ => renesas}/r7s72100.dtsi | 0
.../boot/dts/{ => renesas}/r7s9210-rza2mevb.dts | 0
arch/arm/boot/dts/{ => renesas}/r7s9210.dtsi | 0
.../arm/boot/dts/{ => renesas}/r8a73a4-ape6evm.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a73a4.dtsi | 0
.../dts/{ => renesas}/r8a7740-armadillo800eva.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7740.dtsi | 0
.../{ => renesas}/r8a7742-iwg21d-q7-dbcm-ca.dts | 0
.../r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 0
.../r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 0
.../boot/dts/{ => renesas}/r8a7742-iwg21d-q7.dts | 0
.../arm/boot/dts/{ => renesas}/r8a7742-iwg21m.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7742.dtsi | 0
.../{ => renesas}/r8a7743-iwg20d-q7-dbcm-ca.dts | 0
.../boot/dts/{ => renesas}/r8a7743-iwg20d-q7.dts | 0
.../arm/boot/dts/{ => renesas}/r8a7743-iwg20m.dtsi | 0
.../boot/dts/{ => renesas}/r8a7743-sk-rzg1m.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7743.dtsi | 0
.../{ => renesas}/r8a7744-iwg20d-q7-dbcm-ca.dts | 0
.../boot/dts/{ => renesas}/r8a7744-iwg20d-q7.dts | 0
.../arm/boot/dts/{ => renesas}/r8a7744-iwg20m.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7744.dtsi | 0
.../r8a7745-iwg22d-sodimm-dbhd-ca.dts | 0
.../dts/{ => renesas}/r8a7745-iwg22d-sodimm.dts | 0
.../arm/boot/dts/{ => renesas}/r8a7745-iwg22m.dtsi | 0
.../boot/dts/{ => renesas}/r8a7745-sk-rzg1e.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7745.dtsi | 0
.../boot/dts/{ => renesas}/r8a77470-iwg23s-sbc.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a77470.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7778-bockw.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7778.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7779-marzen.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7779.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7790-lager.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7790-stout.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7790.dtsi | 0
.../arm/boot/dts/{ => renesas}/r8a7791-koelsch.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7791-porter.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7791.dtsi | 0
.../arm/boot/dts/{ => renesas}/r8a7792-blanche.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7792-wheat.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7792.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7793-gose.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7793.dtsi | 0
arch/arm/boot/dts/{ => renesas}/r8a7794-alt.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7794-silk.dts | 0
arch/arm/boot/dts/{ => renesas}/r8a7794.dtsi | 0
.../dts/{ => renesas}/r8a77xx-aa121td01-panel.dtsi | 0
.../dts/{ => renesas}/r9a06g032-rzn1d400-db.dts | 0
arch/arm/boot/dts/{ => renesas}/r9a06g032.dtsi | 0
arch/arm/boot/dts/{ => renesas}/sh73a0-kzm9g.dts | 0
arch/arm/boot/dts/{ => renesas}/sh73a0.dtsi | 0

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2646,13 +2636,7 @@ C: irc://irc.libera.chat/renesas-soc
T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
F: Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
F: Documentation/devicetree/bindings/soc/renesas/
-F: arch/arm/boot/dts/emev2*
-F: arch/arm/boot/dts/gr-peach*
-F: arch/arm/boot/dts/iwg20d-q7*
-F: arch/arm/boot/dts/r7s*
-F: arch/arm/boot/dts/r8a*
-F: arch/arm/boot/dts/r9a*
-F: arch/arm/boot/dts/sh*
+F: arch/arm/boot/dts/renesas/
F: arch/arm/configs/shmobile_defconfig
F: arch/arm/include/debug/renesas-scif.S
F: arch/arm/mach-shmobile/

Acked-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds