Skip to contentSkip to conversation

arm64: dts: renesas: Apply overlays to base dtbs

PATCH In review Rob Herring 2 participants 3 messages Sep 12, 2023 – Sep 19, 2023

Subsystems (2)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 arm64: dts: renesas: Apply overlays to base dtbs

DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time.

---
Looks like some of these apply to multiple base DTs. I've only added them to 1 base.

---
 arch/arm64/boot/dts/renesas/Makefile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/Makefile +15 -2
index 7114cbbd8713..5b23bdb71804 100644
@@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_R8A77980) += r8a77980a-condor-i.dtb
 
 dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb
 
-dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
+r8a77995-draak-panel-aa104xd12-dtbs := r8a77995-draak.dtb draak-ebisu-panel-aa104xd12.dtbo
+dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb r8a77995-draak-panel-aa104xd12.dtb
 
 dtb-$(CONFIG_ARCH_R8A779A0) += r8a779a0-falcon.dtb
 
@@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb
 
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo
+r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo
+dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb
 
 dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-ulcb.dtb
@@ -73,18 +76,28 @@ dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb-kf.dtb
 
-dtb-$(CONFIG_ARCH_R8A77965) += r8a779m5-salvator-xs.dtb
+r8a779m5-salvator-xs-panel-aa104xd12-dtbs := r8a779m5-salvator-xs.dtb salvator-panel-aa104xd12.dtbo
+dtb-$(CONFIG_ARCH_R8A77965) += r8a779m5-salvator-xs.dtb r8a779m5-salvator-xs-panel-aa104xd12.dtb
 
 dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043u11-smarc.dtb
 dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043-smarc-pmod.dtbo
+r9a07g043u11-smarc-pmod-dtbs := r9a07g043u11-smarc.dtb r9a07g043-smarc-pmod.dtbo
+dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043u11-smarc-pmod.dtb
 
 dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc.dtb
 dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc-cru-csi-ov5645.dtbo
+r9a07g044c2-smarc-cru-csi-ov5645-dtbs := r9a07g044c2-smarc.dtb r9a07g044c2-smarc-cru-csi-ov5645.dtbo
+dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc-cru-csi-ov5645.dtb
+
 dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc.dtb
 dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc-cru-csi-ov5645.dtbo
+r9a07g044l2-smarc-cru-csi-ov5645-dtbs := r9a07g044l2-smarc.dtb r9a07g044l2-smarc-cru-csi-ov5645.dtbo
+dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc-cru-csi-ov5645.dtb
 
 dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc.dtb
 dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc-cru-csi-ov5645.dtbo
+r9a07g054l2-smarc-cru-csi-ov5645-dtbs := r9a07g054l2-smarc.dtb r9a07g054l2-smarc-cru-csi-ov5645.dtbo
+dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc-cru-csi-ov5645.dtb
 
 dtb-$(CONFIG_ARCH_R9A09G011) += r9a09g011-v2mevk2.dtb
 
Signature · 1 line
2.40.1
#1 lore raw

Hi Rob,

Quoted 5 lines · Rob Herring

DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time.

Thanks for your patch!

Quoted 2 lines

Looks like some of these apply to multiple base DTs. I've only added them to 1 base.

Indeed:
- draak-ebisu-panel-aa104xd12.dtbo applies to r8a77990-ebisu.dtb, too,
- salvator-panel-aa104xd12.dtbo applies to all salvator-x(s) variants.

So should they be added to all bases they apply to?

Or, if you intend none of the composite DTBs to be consumed as-is, but only intend them to be created for validation, perhaps the additional rules should be grouped together at the bottom of the Makefile?

arch/arm64/boot/dts/renesas/Makefile dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb · line 67

Quoted 6 lines
arch/arm64/boot/dts/renesas/Makefile +0 -0
@@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb
 
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo

Do you still need the individual *.dtbo rules? Perhaps you are afraid that make will auto-delete them as they are only used as intermediaries?

arch/arm64/boot/dts/renesas/Makefile dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb · line 69

Quoted 2 lines
arch/arm64/boot/dts/renesas/Makefile +2 -0
+r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo
+dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
author maintainer
#2 lore raw
Quoted 12 lines · Geert Uytterhoeven

Hi Rob,

Quoted 5 lines · Rob Herring

DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time.

Thanks for your patch!

Quoted 8 lines
Quoted 2 lines

Looks like some of these apply to multiple base DTs. I've only added them to 1 base.

Indeed:
- draak-ebisu-panel-aa104xd12.dtbo applies to r8a77990-ebisu.dtb, too,
- salvator-panel-aa104xd12.dtbo applies to all salvator-x(s) variants.

So should they be added to all bases they apply to?

I'll leave that to you. All depends what combinations you want to validate. I just don't want overlays in the kernel that don't have a base in the kernel.

Quoted 3 lines

Or, if you intend none of the composite DTBs to be consumed as-is, but only intend them to be created for validation, perhaps the additional rules should be grouped together at the bottom of the Makefile?

Folks may want the composite DTBs if their bootloader can't apply them or they don't want to mess with it in the bootloader.

Quoted 10 lines

arch/arm64/boot/dts/renesas/Makefile dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb · line 67

Quoted 6 lines
arch/arm64/boot/dts/renesas/Makefile +0 -0
@@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb
 
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo

Do you still need the individual *.dtbo rules? Perhaps you are afraid that make will auto-delete them as they are only used as intermediaries?

Yes you need them if you want to install the .dtbo's. I'm not sure offhand if it matters for cleaning.

Rob