| Message ID | 20241202-dt-bcm2712-fixes-v1-2-fac67cc2f98a@raspberrypi.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/vc4: Fixup DT and DT binding issues from recent patchset | expand |
On 02/12/2024 15:31, Dave Stevenson wrote: > The previous patch adding the compatible string missed out that > the number of interrupts and clocks changed with BCM2712 too. > > Update to validate clock and interrupts for the variants. > > Fixes: 6cfcbe548a3a ("dt-bindings: display: Add BCM2712 HVS bindings") No such commit on current next. > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> > --- > .../bindings/display/brcm,bcm2835-hvs.yaml | 77 +++++++++++++++++----- > 1 file changed, 61 insertions(+), 16 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml > index f91c9dce2a44..ab59edbcf32c 100644 > --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml > +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml > @@ -19,12 +19,13 @@ properties: > reg: > maxItems: 1 > > - interrupts: > - maxItems: 1 > + interrupts: true No, widest constrains are *always* here. > > - clocks: > - maxItems: 1 > - description: Core Clock > + interrupt-names: true > + > + clocks: true > + > + clock-names: true No, this has to be complete (widest) here. > > required: > - compatible > @@ -33,17 +34,61 @@ required: > Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml index f91c9dce2a44..ab59edbcf32c 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml @@ -19,12 +19,13 @@ properties: reg: maxItems: 1 - interrupts: - maxItems: 1 + interrupts: true - clocks: - maxItems: 1 - description: Core Clock + interrupt-names: true + + clocks: true + + clock-names: true required: - compatible @@ -33,17 +34,61 @@ required: additionalProperties: false -if: - properties: - compatible: - contains: - enum: - - brcm,bcm2711-hvs - - brcm,bcm2712-hvs - -then: - required: - - clocks +allOf: + - if: + properties: + compatible: + contains: + const: brcm,bcm2711-hvs + + then: + properties: + clocks: + items: + - description: Core Clock + + required: + - clocks + + - if: + properties: + compatible: + contains: + const: brcm,bcm2712-hvs + + then: + properties: + clocks: + maxItems: 2 + clock-names: + items: + - const: core + - const: disp + interrupts: + items: + - description: Channel 0 End of frame + - description: Channel 1 End of frame + - description: Channel 2 End of frame + interrupt-names: + items: + - const: ch0-eof + - const: ch1-eof + - const: ch2-eof + required: + - clocks + - clock-names + - interrupt-names + + - if: + properties: + compatible: + contains: + const: brcm,bcm2835-hvs + + then: + properties: + interrupts: + maxItems: 1 examples: - |
The previous patch adding the compatible string missed out that the number of interrupts and clocks changed with BCM2712 too. Update to validate clock and interrupts for the variants. Fixes: 6cfcbe548a3a ("dt-bindings: display: Add BCM2712 HVS bindings") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- .../bindings/display/brcm,bcm2835-hvs.yaml | 77 +++++++++++++++++----- 1 file changed, 61 insertions(+), 16 deletions(-)