mirror of https://github.com/torvalds/linux.git
dt-bindings: display: bcm2711-hdmi: Add interrupt details for BCM2712
Commit62948c62ab("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:62948c62ab("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>
This commit is contained in:
parent
546dbb0223
commit
3f7f665304
|
|
@ -56,22 +56,12 @@ properties:
|
||||||
- const: cec
|
- const: cec
|
||||||
|
|
||||||
interrupts:
|
interrupts:
|
||||||
items:
|
minItems: 5
|
||||||
- description: CEC TX interrupt
|
maxItems: 6
|
||||||
- description: CEC RX interrupt
|
|
||||||
- description: CEC stuck at low interrupt
|
|
||||||
- description: Wake-up interrupt
|
|
||||||
- description: Hotplug connected interrupt
|
|
||||||
- description: Hotplug removed interrupt
|
|
||||||
|
|
||||||
interrupt-names:
|
interrupt-names:
|
||||||
items:
|
minItems: 5
|
||||||
- const: cec-tx
|
maxItems: 6
|
||||||
- const: cec-rx
|
|
||||||
- const: cec-low
|
|
||||||
- const: wakeup
|
|
||||||
- const: hpd-connected
|
|
||||||
- const: hpd-removed
|
|
||||||
|
|
||||||
ddc:
|
ddc:
|
||||||
$ref: /schemas/types.yaml#/definitions/phandle
|
$ref: /schemas/types.yaml#/definitions/phandle
|
||||||
|
|
@ -112,6 +102,61 @@ required:
|
||||||
|
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
|
||||||
|
allOf:
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
contains:
|
||||||
|
enum:
|
||||||
|
- brcm,bcm2711-hdmi0
|
||||||
|
- brcm,bcm2711-hdmi1
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
interrupts:
|
||||||
|
items:
|
||||||
|
- description: CEC TX interrupt
|
||||||
|
- description: CEC RX interrupt
|
||||||
|
- description: CEC stuck at low interrupt
|
||||||
|
- description: Wake-up interrupt
|
||||||
|
- description: Hotplug connected interrupt
|
||||||
|
- description: Hotplug removed interrupt
|
||||||
|
interrupt-names:
|
||||||
|
items:
|
||||||
|
- const: cec-tx
|
||||||
|
- const: cec-rx
|
||||||
|
- const: cec-low
|
||||||
|
- const: wakeup
|
||||||
|
- const: hpd-connected
|
||||||
|
- const: hpd-removed
|
||||||
|
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
contains:
|
||||||
|
enum:
|
||||||
|
- brcm,bcm2712-hdmi0
|
||||||
|
- brcm,bcm2712-hdmi1
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
interrupts:
|
||||||
|
items:
|
||||||
|
- description: CEC TX interrupt
|
||||||
|
- description: CEC RX interrupt
|
||||||
|
- description: CEC stuck at low interrupt
|
||||||
|
- description: Hotplug connected interrupt
|
||||||
|
- description: Hotplug removed interrupt
|
||||||
|
interrupts-names:
|
||||||
|
items:
|
||||||
|
- const: cec-tx
|
||||||
|
- const: cec-rx
|
||||||
|
- const: cec-low
|
||||||
|
- const: hpd-connected
|
||||||
|
- const: hpd-removed
|
||||||
|
|
||||||
|
required:
|
||||||
|
- interrupts
|
||||||
|
- interrupt-names
|
||||||
|
|
||||||
examples:
|
examples:
|
||||||
- |
|
- |
|
||||||
hdmi0: hdmi@7ef00700 {
|
hdmi0: hdmi@7ef00700 {
|
||||||
|
|
@ -136,6 +181,9 @@ examples:
|
||||||
"hd";
|
"hd";
|
||||||
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
|
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
|
||||||
clock-names = "hdmi", "bvb", "audio", "cec";
|
clock-names = "hdmi", "bvb", "audio", "cec";
|
||||||
|
interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
|
||||||
|
interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup",
|
||||||
|
"hpd-connected", "hpd-removed";
|
||||||
resets = <&dvp 0>;
|
resets = <&dvp 0>;
|
||||||
ddc = <&ddc0>;
|
ddc = <&ddc0>;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue