Commit 6bf331d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree fixes from Rob Herring:

 - Another batch of graph and video-interfaces schema conversions

 - Drop DT header symlink for dropped C6X arch

 - Fix bcm2711-hdmi schema error

* tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: media: Use graph and video-interfaces schemas, round 2
  dts: drop dangling c6x symlink
  dt-bindings: bcm2711-hdmi: Fix broken schema
parents 54663cf3 b5a95bb1

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ required: 
  - resets

  - ddc



unevaluatedProperties: false

additionalProperties: false



examples:

  - |

Documentation/devicetree/bindings/media/i2c/imx258.yaml

+7 −7
Original line number Diff line number Diff line
@@ -49,10 +49,14 @@ properties: 


  # See ../video-interfaces.txt for more details

  port:

    type: object

    $ref: /schemas/graph.yaml#/properties/port

    additionalProperties: false



    properties:

      endpoint:

        type: object

        $ref: /schemas/media/video-interfaces.yaml#

        unevaluatedProperties: false



        properties:

          data-lanes:

            oneOf:
@@ -65,11 +69,7 @@ properties: 
                  - const: 1

                  - const: 2



          link-frequencies:

            allOf:

              - $ref: /schemas/types.yaml#/definitions/uint64-array

            description:

              Allowed data bus frequencies.

          link-frequencies: true



        required:

          - data-lanes

Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ properties: 
    maxItems: 1



  port:

    $ref: /schemas/graph.yaml#/$defs/port-base

    $ref: /schemas/graph.yaml#/properties/port

    additionalProperties: false



    properties:

      endpoint:
@@ -41,8 +42,6 @@ properties: 
        properties:

          clock-noncontinuous: true



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml

+5 −11
Original line number Diff line number Diff line
@@ -44,19 +44,17 @@ properties: 
    description: Reset Pin GPIO Control (active low)



  port:

    type: object

    description: MIPI CSI-2 transmitter port

    $ref: /schemas/graph.yaml#/properties/port

    additionalProperties: false



    properties:

      endpoint:

        type: object

        $ref: /schemas/media/video-interfaces.yaml#

        unevaluatedProperties: false



        properties:

          remote-endpoint: true



          link-frequencies:

            $ref: /schemas/types.yaml#/definitions/uint64-array

            description: Allowed MIPI CSI-2 link frequencies

          link-frequencies: true



          data-lanes:

            minItems: 1
@@ -65,10 +63,6 @@ properties: 
        required:

          - data-lanes

          - link-frequencies

          - remote-endpoint



    required:

      - endpoint



required:

  - compatible

Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml

+5 −11
Original line number Diff line number Diff line
@@ -44,19 +44,17 @@ properties: 
    description: Reset Pin GPIO Control (active low)



  port:

    type: object

    description: MIPI CSI-2 transmitter port

    $ref: /schemas/graph.yaml#/properties/port

    additionalProperties: false



    properties:

      endpoint:

        type: object

        $ref: /schemas/media/video-interfaces.yaml#

        unevaluatedProperties: false



        properties:

          remote-endpoint: true



          link-frequencies:

            $ref: /schemas/types.yaml#/definitions/uint64-array

            description: Allowed MIPI CSI-2 link frequencies

          link-frequencies: true



          data-lanes:

            minItems: 1
@@ -65,10 +63,6 @@ properties: 
        required:

          - data-lanes

          - link-frequencies

          - remote-endpoint



    required:

      - endpoint



required:

  - compatible