Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: display: bcm2711-hdmi: Add interrupt details for BCM2712

Commit 62948c62abca ("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: 62948c62abca ("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>

authored by

Dave Stevenson and committed by
Rob Herring (Arm)
3f7f6653 546dbb02

+62 -14
+62 -14
Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
··· 56 56 - const: cec 57 57 58 58 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 66 61 67 62 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 75 65 76 66 ddc: 77 67 $ref: /schemas/types.yaml#/definitions/phandle ··· 102 112 103 113 additionalProperties: false 104 114 115 + allOf: 116 + - if: 117 + properties: 118 + compatible: 119 + contains: 120 + enum: 121 + - brcm,bcm2711-hdmi0 122 + - brcm,bcm2711-hdmi1 123 + then: 124 + properties: 125 + interrupts: 126 + items: 127 + - description: CEC TX interrupt 128 + - description: CEC RX interrupt 129 + - description: CEC stuck at low interrupt 130 + - description: Wake-up interrupt 131 + - description: Hotplug connected interrupt 132 + - description: Hotplug removed interrupt 133 + interrupt-names: 134 + items: 135 + - const: cec-tx 136 + - const: cec-rx 137 + - const: cec-low 138 + - const: wakeup 139 + - const: hpd-connected 140 + - const: hpd-removed 141 + 142 + - if: 143 + properties: 144 + compatible: 145 + contains: 146 + enum: 147 + - brcm,bcm2712-hdmi0 148 + - brcm,bcm2712-hdmi1 149 + then: 150 + properties: 151 + interrupts: 152 + items: 153 + - description: CEC TX interrupt 154 + - description: CEC RX interrupt 155 + - description: CEC stuck at low interrupt 156 + - description: Hotplug connected interrupt 157 + - description: Hotplug removed interrupt 158 + interrupts-names: 159 + items: 160 + - const: cec-tx 161 + - const: cec-rx 162 + - const: cec-low 163 + - const: hpd-connected 164 + - const: hpd-removed 165 + 166 + required: 167 + - interrupts 168 + - interrupt-names 169 + 105 170 examples: 106 171 - | 107 172 hdmi0: hdmi@7ef00700 { ··· 181 136 "hd"; 182 137 clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; 183 138 clock-names = "hdmi", "bvb", "audio", "cec"; 139 + interrupts = <0>, <1>, <2>, <3>, <4>, <5>; 140 + interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup", 141 + "hpd-connected", "hpd-removed"; 184 142 resets = <&dvp 0>; 185 143 ddc = <&ddc0>; 186 144 };