Skip to content

Commit 1705bbe

Browse files
6by9robherring
authored andcommitted
dt-bindings: display: Fix brcm,bcm2835-hvs bindings for BCM2712
Commit 6cfcbe5 ("dt-bindings: display: Add BCM2712 HVS bindings") added the compatible string for BCM2712, but missed out that the number of interrupts and clocks changed too. The driver commit 7687a12 ("drm/vc4: hvs: Add support for BCM2712 HVS") also requires that both interrupts and clocks are named, so the relevant -names properties are also added to "required" for BCM2712. Update to validate clock, interrupts, and their names for the BCM2712 variant. (There should be no change in the binding requirements for the other variants). Fixes: 6cfcbe5 ("dt-bindings: display: Add BCM2712 HVS bindings") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Link: https://patch.msgid.link/20241220-dt-bcm2712-fixes-v5-2-cbbf13d2e97a@raspberrypi.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
1 parent 3f7f665 commit 1705bbe

1 file changed

Lines changed: 74 additions & 14 deletions

File tree

Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml

Lines changed: 74 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,20 @@ properties:
2020
maxItems: 1
2121

2222
interrupts:
23-
maxItems: 1
23+
minItems: 1
24+
maxItems: 3
25+
26+
interrupt-names:
27+
minItems: 1
28+
maxItems: 3
2429

2530
clocks:
26-
maxItems: 1
27-
description: Core Clock
31+
minItems: 1
32+
maxItems: 2
33+
34+
clock-names:
35+
minItems: 1
36+
maxItems: 2
2837

2938
required:
3039
- compatible
@@ -33,17 +42,68 @@ required:
3342

3443
additionalProperties: false
3544

36-
if:
37-
properties:
38-
compatible:
39-
contains:
40-
enum:
41-
- brcm,bcm2711-hvs
42-
- brcm,bcm2712-hvs
43-
44-
then:
45-
required:
46-
- clocks
45+
allOf:
46+
- if:
47+
properties:
48+
compatible:
49+
contains:
50+
const: brcm,bcm2711-hvs
51+
52+
then:
53+
properties:
54+
clocks:
55+
items:
56+
- description: Core Clock
57+
interrupts:
58+
maxItems: 1
59+
clock-names: false
60+
interrupt-names: false
61+
62+
required:
63+
- clocks
64+
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
const: brcm,bcm2712-hvs
70+
71+
then:
72+
properties:
73+
clocks:
74+
minItems: 2
75+
maxItems: 2
76+
clock-names:
77+
items:
78+
- const: core
79+
- const: disp
80+
interrupts:
81+
items:
82+
- description: Channel 0 End of frame
83+
- description: Channel 1 End of frame
84+
- description: Channel 2 End of frame
85+
interrupt-names:
86+
items:
87+
- const: ch0-eof
88+
- const: ch1-eof
89+
- const: ch2-eof
90+
required:
91+
- clocks
92+
- clock-names
93+
- interrupt-names
94+
95+
- if:
96+
properties:
97+
compatible:
98+
contains:
99+
const: brcm,bcm2835-hvs
100+
101+
then:
102+
properties:
103+
interrupts:
104+
maxItems: 1
105+
clock-names: false
106+
interrupt-names: false
47107

48108
examples:
49109
- |

0 commit comments

Comments
 (0)