Commit 2bd50abc authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next 

Pick up new meta-schema warning fixes.
parents 548f8b21 652980b1

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ maintainers: 
properties:

  compatible:

    enum:

      - nvidia,tegra20-pmc

      - nvidia,tegra20-pmc

      - nvidia,tegra30-pmc

      - nvidia,tegra114-pmc

Documentation/devicetree/bindings/bus/ti-sysc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ properties: 
    oneOf:

      - items:

          - enum:

              - ti,sysc-omap2

              - ti,sysc-omap2

              - ti,sysc-omap4

              - ti,sysc-omap4-simple

Documentation/devicetree/bindings/display/panel/panel-timing.yaml

+18 −24
Original line number Diff line number Diff line
@@ -71,78 +71,72 @@ properties: 


  hfront-porch:

    description: Horizontal front porch panel timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of pixels

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of pixels



  hback-porch:

    description: Horizontal back porch timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of pixels

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of pixels



  hsync-len:

    description: Horizontal sync length panel timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of pixels

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of pixels



  vfront-porch:

    description: Vertical front porch panel timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of lines

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of lines



  vback-porch:

    description: Vertical back porch panel timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of lines

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of lines



  vsync-len:

    description: Vertical sync length panel timing

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

    oneOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

        maxItems: 1

      - maxItems: 1

        items:

          description: typical number of lines

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

        minItems: 3

      - minItems: 3

        maxItems: 3

        items:

          description: min, typ, max number of lines

Documentation/devicetree/bindings/extcon/maxim,max77843.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ properties: 
    $ref: /schemas/connector/usb-connector.yaml#



  ports:

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

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

    description:

      Any connector to the data bus of this controller should be modelled using

      the OF graph bindings specified

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
          - mediatek,mt8183-mali

          - realtek,rtd1619-mali

          - renesas,r9a07g044-mali

          - renesas,r9a07g054-mali

          - rockchip,px30-mali

          - rockchip,rk3568-mali

      - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
@@ -109,7 +110,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: renesas,r9a07g044-mali

            enum:

              - renesas,r9a07g044-mali

              - renesas,r9a07g054-mali

    then:

      properties:

        interrupts: