Commit a70ae18b authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next 



Merge fixes to avoid binding schema warnings.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parents 6663ae07 b2d70c0d

Documentation/devicetree/bindings/arm/tegra.yaml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ properties: 
          - const: toradex,apalis_t30

          - const: nvidia,tegra30

      - items:

          - const: toradex,apalis_t30-eval-v1.1

          - const: toradex,apalis_t30-v1.1-eval

          - const: toradex,apalis_t30-eval

          - const: toradex,apalis_t30-v1.1

          - const: toradex,apalis_t30

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ properties: 
              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                maxItems: 4

                items:

                  - const: 1

                  - const: 2
@@ -71,7 +70,6 @@ properties: 
              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                maxItems: 4

                items:

                  - const: 1

                  - const: 2

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ properties: 
    const: ti,sn65dsi86



  reg:

    const: 0x2d

    enum: [ 0x2c, 0x2d ]



  enable-gpios:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ function block. 


All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.

For a description of the MMSYS_CONFIG binding, see

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.



DISP function blocks

====================

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

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



  port:

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

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

    additionalProperties: false



    properties: