Commit 3f7f6653 authored by Dave Stevenson's avatar Dave Stevenson Committed by Rob Herring (Arm)
Browse files

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



Commit 62948c62 ("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: 62948c62 ("dt-bindings: display: Add BCM2712 HDMI bindings")
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patch.msgid.link/20241220-dt-bcm2712-fixes-v5-1-cbbf13d2e97a@raspberrypi.com


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 546dbb02

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

+62 −14
Original line number Diff line number Diff line
@@ -56,22 +56,12 @@ properties: 
      - const: cec



  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

    minItems: 5

    maxItems: 6



  interrupt-names:

    items:

      - const: cec-tx

      - const: cec-rx

      - const: cec-low

      - const: wakeup

      - const: hpd-connected

      - const: hpd-removed

    minItems: 5

    maxItems: 6



  ddc:

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


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:

  - |

    hdmi0: hdmi@7ef00700 {
@@ -136,6 +181,9 @@ examples: 
                    "hd";

        clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;

        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>;

        ddc = <&ddc0>;

    };