Commit b5a95bb1 authored by Rob Herring's avatar Rob Herring

dt-bindings: media: Use graph and video-interfaces schemas, round 2

A couple of media schemas got applied without using or incorrectly
using the video-interfaces.yaml and graph.yaml schemas. Fix them up
before we have more copy-n-paste errors.

Fixes: 41b3e233 ("media: dt-bindings: media: Add bindings for imx334")
Fixes: d899e5f1 ("media: dt-bindings: media: imx258: add bindings for IMX258 sensor")
Fixes: 918b866e ("media: dt-bindings: Remove old ov5647.yaml file, update ovti,ov5647.yaml")
Fixes: 22f2b475 ("media: dt-bindings: media: i2c: Add OV8865 bindings documentation")
Fixes: 29a202fa ("media: dt-bindings: media: i2c: Add OV5648 bindings documentation")
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>
Cc: Jacopo Mondi <jacopo@jmondi.org>
Cc: "Paul J. Murphy" <paul.j.murphy@intel.com>
Cc: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cc: linux-media@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20210223210127.55455-1-robh@kernel.org
parent 497a4dc8
...@@ -49,10 +49,14 @@ properties: ...@@ -49,10 +49,14 @@ properties:
# See ../video-interfaces.txt for more details # See ../video-interfaces.txt for more details
port: port:
type: object $ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
data-lanes: data-lanes:
oneOf: oneOf:
...@@ -65,11 +69,7 @@ properties: ...@@ -65,11 +69,7 @@ properties:
- const: 1 - const: 1
- const: 2 - const: 2
link-frequencies: link-frequencies: true
allOf:
- $ref: /schemas/types.yaml#/definitions/uint64-array
description:
Allowed data bus frequencies.
required: required:
- data-lanes - data-lanes
......
...@@ -31,7 +31,8 @@ properties: ...@@ -31,7 +31,8 @@ properties:
maxItems: 1 maxItems: 1
port: port:
$ref: /schemas/graph.yaml#/$defs/port-base $ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
...@@ -41,8 +42,6 @@ properties: ...@@ -41,8 +42,6 @@ properties:
properties: properties:
clock-noncontinuous: true clock-noncontinuous: true
additionalProperties: false
required: required:
- compatible - compatible
- reg - reg
......
...@@ -44,19 +44,17 @@ properties: ...@@ -44,19 +44,17 @@ properties:
description: Reset Pin GPIO Control (active low) description: Reset Pin GPIO Control (active low)
port: port:
type: object
description: MIPI CSI-2 transmitter port description: MIPI CSI-2 transmitter port
$ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
remote-endpoint: true link-frequencies: true
link-frequencies:
$ref: /schemas/types.yaml#/definitions/uint64-array
description: Allowed MIPI CSI-2 link frequencies
data-lanes: data-lanes:
minItems: 1 minItems: 1
...@@ -65,10 +63,6 @@ properties: ...@@ -65,10 +63,6 @@ properties:
required: required:
- data-lanes - data-lanes
- link-frequencies - link-frequencies
- remote-endpoint
required:
- endpoint
required: required:
- compatible - compatible
......
...@@ -44,19 +44,17 @@ properties: ...@@ -44,19 +44,17 @@ properties:
description: Reset Pin GPIO Control (active low) description: Reset Pin GPIO Control (active low)
port: port:
type: object
description: MIPI CSI-2 transmitter port description: MIPI CSI-2 transmitter port
$ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
remote-endpoint: true link-frequencies: true
link-frequencies:
$ref: /schemas/types.yaml#/definitions/uint64-array
description: Allowed MIPI CSI-2 link frequencies
data-lanes: data-lanes:
minItems: 1 minItems: 1
...@@ -65,10 +63,6 @@ properties: ...@@ -65,10 +63,6 @@ properties:
required: required:
- data-lanes - data-lanes
- link-frequencies - link-frequencies
- remote-endpoint
required:
- endpoint
required: required:
- compatible - compatible
......
...@@ -36,18 +36,17 @@ properties: ...@@ -36,18 +36,17 @@ properties:
description: Reference to the GPIO connected to the XCLR pin, if any. description: Reference to the GPIO connected to the XCLR pin, if any.
port: port:
type: object
additionalProperties: false additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port $ref: /schemas/graph.yaml#/properties/port
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
data-lanes: data-lanes: true
$ref: ../video-interfaces.yaml#/properties/data-lanes link-frequencies: true
link-frequencies:
$ref: ../video-interfaces.yaml#/properties/link-frequencies
required: required:
- data-lanes - data-lanes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment