Skip to contentSkip to conversation

dt-bindings: bcm2711-hdmi: Fix broken schema

PATCH Applied Maxime Ripard 4 participants 5 messages Feb 18, 2021 – Mar 30, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dt-bindings: bcm2711-hdmi: Fix broken schema

For some reason, unevaluatedProperties doesn't work and additionalProperties is required. Fix it by switching to additionalProperties.

---
 .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml +1 -1
index 57324a5f0271..a1d5a32660e0 100644
@@ -109,7 +109,7 @@ required:
   - resets
   - ddc
 
-unevaluatedProperties: false
+additionalProperties: false
 
 examples:
   - |
Signature · 1 line
2.29.2
maintainer Applied
#1 lore raw
Quoted 9 lines · Maxime Ripard

For some reason, unevaluatedProperties doesn't work and additionalProperties is required. Fix it by switching to additionalProperties.

---
 .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks!

#2 lore raw
Quoted 6 lines · Rob Herring
Quoted 4 lines · Maxime Ripard

For some reason, unevaluatedProperties doesn't work and additionalProperties is required. Fix it by switching to additionalProperties.

Quoted 7 lines
Quoted 5 lines
---
 .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks!

Something weird is going on with this fix. linux-next doesn't end up with the change even though 5.12-rc2 has it. I suspect it's because the original commit is in 2 branches (drm-misc-next and drm-misc-fixes), but the fix was applied by me. I'm not sure how linux-next didn't have a manual merge for this.

Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Hi Rob,

Quoted 14 lines · On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <[email protected]> wrote:
Quoted 12 lines · Rob Herring
Quoted 9 lines · Maxime Ripard

For some reason, unevaluatedProperties doesn't work and additionalProperties is required. Fix it by switching to additionalProperties.

---
 .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 7 lines
Quoted 1 line

Applied, thanks!

Something weird is going on with this fix. linux-next doesn't end up with the change even though 5.12-rc2 has it. I suspect it's because the original commit is in 2 branches (drm-misc-next and drm-misc-fixes), but the fix was applied by me. I'm not sure how linux-next didn't have a manual merge for this.

I think it goes like this:

Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged into v5.12-rc1-dontuse and had "additionalProperties: false" and is the common base for all later changes to this file.

Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts") changes to "unevaluatedProperties: false" and is merged into v5.12-rc1-dontuse.

Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema") changes to "additionalProperties: false" and is merged into v5.12-rc2.

Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts") changes (from a99163e9e708) to "unevaluatedProperties: false" in the drm-misc and then drm trees.

When I come to merge the drm tree into linux-next, the merge base is v5.12-rc3 and the only change to this file since v5.12-rc3 is in the drm tree ...

Another way to look at it is that one one side of my merge, the line goes from "additionalProperties: false" to "unevaluatedProperties:
false" and back to "additionalProperties: false" (so no net change) and on the other side if my merge the line changes to "unevaluatedProperties: false".

Signature · 2 lines
Cheers,
Stephen Rothwell

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw

Hi Stephen,

Quoted 46 lines · Stephen Rothwell

Hi Rob,

Quoted 14 lines · On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <[email protected]> wrote:
Quoted 12 lines · Rob Herring
Quoted 9 lines · Maxime Ripard

For some reason, unevaluatedProperties doesn't work and additionalProperties is required. Fix it by switching to additionalProperties.

---
 .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 7 lines
Quoted 1 line

Applied, thanks!

Something weird is going on with this fix. linux-next doesn't end up with the change even though 5.12-rc2 has it. I suspect it's because the original commit is in 2 branches (drm-misc-next and drm-misc-fixes), but the fix was applied by me. I'm not sure how linux-next didn't have a manual merge for this.

I think it goes like this:

Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged into v5.12-rc1-dontuse and had "additionalProperties: false" and is the common base for all later changes to this file.

Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts") changes to "unevaluatedProperties: false" and is merged into v5.12-rc1-dontuse.

Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema") changes to "additionalProperties: false" and is merged into v5.12-rc2.

Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts") changes (from a99163e9e708) to "unevaluatedProperties: false" in the drm-misc and then drm trees.

When I come to merge the drm tree into linux-next, the merge base is v5.12-rc3 and the only change to this file since v5.12-rc3 is in the drm tree ...

Quoted 5 lines

Another way to look at it is that one one side of my merge, the line goes from "additionalProperties: false" to "unevaluatedProperties:
false" and back to "additionalProperties: false" (so no net change) and on the other side if my merge the line changes to "unevaluatedProperties: false".

So I guess the easiest fix for this would be to merge it through DRM-misc? Or should we just wait until all the branches gets merged in Linus' tree?

Maxime

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel