Commit f0f54727 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: Revert "media: dt-bindings: media: Use OF graph schema" 



This reverts commit f61eb7bc.

While aligning with the OF graph schema will be done for the media DT
bindings, this patch got merged a little too hastily. Revert it for now.

Suggested-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d5da31f9

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ properties: 
  # See ./video-interfaces.txt for details

  port:

    type: object

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

    additionalProperties: false



    properties:

Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ properties: 
  # See ./video-interfaces.txt for details

  port:

    type: object

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



    properties:

      endpoint:

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

+24 −7
Original line number Diff line number Diff line
@@ -36,9 +36,17 @@ properties: 
    maxItems: 1



  port:

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

    type: object

    description:

      A node containing a single endpoint as doucmented in

      Documentation/devicetree/bindings/media/video-interfaces.txt



  ports: true

  ports:

    type: object

    description:

      A node containing input and output port nodes with endpoint definitions

      as documented in

      Documentation/devicetree/bindings/media/video-interfaces.txt



additionalProperties: false
@@ -72,19 +80,24 @@ allOf: 
    then:

      properties:

        ports:

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

          properties:

            '#address-cells':

              const: 1

            '#size-cells':

              const: 0

            port@3:

              type: object

              description: Output port



          patternProperties:

            "^port@[0-2]$":

              type: object

              description: Input port



          required:

            - port@3



          unevaluatedProperties: false

          additionalProperties: false



      required:

        - ports
@@ -97,20 +110,24 @@ allOf: 
    then:

      properties:

        ports:

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

          properties:

            '#address-cells':

              const: 1

            '#size-cells':

              const: 0

            port@6:

              type: object

              description: Output port



          patternProperties:

            "^port@[0-5]$":

              type: object

              description: Input port



          required:

            - port@6



          unevaluatedProperties: false

          additionalProperties: false



      required:

        - ports

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

+26 −6
Original line number Diff line number Diff line
@@ -64,12 +64,16 @@ properties: 
    description:

      Select which input is selected after reset.



  ports: true

  ports:

    type: object

    description:

      A node containing input and output port nodes with endpoint definitions

      as documented in

      Documentation/devicetree/bindings/media/video-interfaces.txt



required:

  - compatible

  - reg

  - ports



additionalProperties: false
@@ -82,17 +86,25 @@ allOf: 
    then:

      properties:

        ports:

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

          properties:

            '#address-cells':

              const: 1

            '#size-cells':

              const: 0

            port@0:

              type: object

              description: Input port

            port@1:

              type: object

              description: Output port



          required:

            - port@1



          unevaluatedProperties: false

          additionalProperties: false



      required:

        - ports



  - if:

      properties:
@@ -102,19 +114,27 @@ allOf: 
    then:

      properties:

        ports:

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

          properties:

            '#address-cells':

              const: 1

            '#size-cells':

              const: 0

            port@2:

              type: object

              description: Output port



          patternProperties:

            "^port@[0-1]$":

              type: object

              description: Input port



          required:

            - port@2



          unevaluatedProperties: false

          additionalProperties: false



      required:

        - ports



examples:

  - |

Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml

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



  port:

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

    type: object

    description: |

      Output video port. See ../video-interfaces.txt.