Skip to content

Commit 3f7f665

Browse files
6by9robherring
authored andcommitted
dt-bindings: display: bcm2711-hdmi: Add interrupt details for BCM2712
Commit 62948c6 ("dt-bindings: display: Add BCM2712 HDMI bindings") added the compatible strings for BCM2712, but missed out that the number of interrupts changed with the "wakeup" interrupt not present in the BCM7212. Update the schema to correct the interrupt requirements for BCM2712. (Requirements for BCM2711 should be unchanged). Fixes: 62948c6 ("dt-bindings: display: Add BCM2712 HDMI bindings") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Link: https://patch.msgid.link/20241220-dt-bcm2712-fixes-v5-1-cbbf13d2e97a@raspberrypi.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
1 parent 546dbb0 commit 3f7f665

1 file changed

Lines changed: 62 additions & 14 deletions

File tree

Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml

Lines changed: 62 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,12 @@ properties:
5656
- const: cec
5757

5858
interrupts:
59-
items:
60-
- description: CEC TX interrupt
61-
- description: CEC RX interrupt
62-
- description: CEC stuck at low interrupt
63-
- description: Wake-up interrupt
64-
- description: Hotplug connected interrupt
65-
- description: Hotplug removed interrupt
59+
minItems: 5
60+
maxItems: 6
6661

6762
interrupt-names:
68-
items:
69-
- const: cec-tx
70-
- const: cec-rx
71-
- const: cec-low
72-
- const: wakeup
73-
- const: hpd-connected
74-
- const: hpd-removed
63+
minItems: 5
64+
maxItems: 6
7565

7666
ddc:
7767
$ref: /schemas/types.yaml#/definitions/phandle
@@ -112,6 +102,61 @@ required:
112102

113103
additionalProperties: false
114104

105+
allOf:
106+
- if:
107+
properties:
108+
compatible:
109+
contains:
110+
enum:
111+
- brcm,bcm2711-hdmi0
112+
- brcm,bcm2711-hdmi1
113+
then:
114+
properties:
115+
interrupts:
116+
items:
117+
- description: CEC TX interrupt
118+
- description: CEC RX interrupt
119+
- description: CEC stuck at low interrupt
120+
- description: Wake-up interrupt
121+
- description: Hotplug connected interrupt
122+
- description: Hotplug removed interrupt
123+
interrupt-names:
124+
items:
125+
- const: cec-tx
126+
- const: cec-rx
127+
- const: cec-low
128+
- const: wakeup
129+
- const: hpd-connected
130+
- const: hpd-removed
131+
132+
- if:
133+
properties:
134+
compatible:
135+
contains:
136+
enum:
137+
- brcm,bcm2712-hdmi0
138+
- brcm,bcm2712-hdmi1
139+
then:
140+
properties:
141+
interrupts:
142+
items:
143+
- description: CEC TX interrupt
144+
- description: CEC RX interrupt
145+
- description: CEC stuck at low interrupt
146+
- description: Hotplug connected interrupt
147+
- description: Hotplug removed interrupt
148+
interrupts-names:
149+
items:
150+
- const: cec-tx
151+
- const: cec-rx
152+
- const: cec-low
153+
- const: hpd-connected
154+
- const: hpd-removed
155+
156+
required:
157+
- interrupts
158+
- interrupt-names
159+
115160
examples:
116161
- |
117162
hdmi0: hdmi@7ef00700 {
@@ -136,6 +181,9 @@ examples:
136181
"hd";
137182
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
138183
clock-names = "hdmi", "bvb", "audio", "cec";
184+
interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
185+
interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup",
186+
"hpd-connected", "hpd-removed";
139187
resets = <&dvp 0>;
140188
ddc = <&ddc0>;
141189
};

0 commit comments

Comments
 (0)