2021-02-23 21:20:31

by Rob Herring

Subject: [PATCH] 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: 41b3e23376e9 ("media: dt-bindings: media: Add bindings for imx334")
Fixes: d899e5f1db7a ("media: dt-bindings: media: imx258: add bindings for IMX258 sensor")
Fixes: 918b866edfec ("media: dt-bindings: Remove old ov5647.yaml file, update ovti,ov5647.yaml")
Fixes: 22f2b47517a6 ("media: dt-bindings: media: i2c: Add OV8865 bindings documentation")
Fixes: 29a202fa7acc ("media: dt-bindings: media: i2c: Add OV5648 bindings documentation")
Cc: Sakari Ailus <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Dave Stevenson <[email protected]>
Cc: Jacopo Mondi <[email protected]>
Cc: "Paul J. Murphy" <[email protected]>
Cc: Daniele Alessandrelli <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Paul Kocialkowski <[email protected]>
Cc: [email protected]
Signed-off-by: Rob Herring <[email protected]>
---
Please ack and I'll send to Linus for rc1.

.../devicetree/bindings/media/i2c/imx258.yaml | 14 +++++++-------
.../bindings/media/i2c/ovti,ov5647.yaml | 5 ++---
.../bindings/media/i2c/ovti,ov5648.yaml | 16 +++++-----------
.../bindings/media/i2c/ovti,ov8865.yaml | 16 +++++-----------
.../bindings/media/i2c/sony,imx334.yaml | 11 +++++------
5 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/i2c/imx258.yaml b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
index eaf77866ed9b..515317eff41a 100644
--- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
index 1ab22e75d3c6..3e5d82df90a2 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
index f8783f77cc54..9149f5685688 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
index c0ba28aa30c4..0699c7e4fdeb 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
index 24e689314bde..27cc5b7ff613 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
@@ -36,18 +36,17 @@ properties:
description: Reference to the GPIO connected to the XCLR pin, if any.

port:
- type: object
additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port

properties:
endpoint:
- type: object
+ $ref: /schemas/media/video-interfaces.yaml#
+ unevaluatedProperties: false
+
properties:
- data-lanes:
- $ref: ../video-interfaces.yaml#/properties/data-lanes
- link-frequencies:
- $ref: ../video-interfaces.yaml#/properties/link-frequencies
+ data-lanes: true
+ link-frequencies: true

required:
- data-lanes
--
2.27.0

2021-02-23 21:27:23

by Sakari Ailus

Subject: Re: [PATCH] dt-bindings: media: Use graph and video-interfaces schemas, round 2

Hi Rob,

On Tue, Feb 23, 2021 at 03:01:27PM -0600, Rob Herring wrote:
> 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: 41b3e23376e9 ("media: dt-bindings: media: Add bindings for imx334")
> Fixes: d899e5f1db7a ("media: dt-bindings: media: imx258: add bindings for IMX258 sensor")
> Fixes: 918b866edfec ("media: dt-bindings: Remove old ov5647.yaml file, update ovti,ov5647.yaml")
> Fixes: 22f2b47517a6 ("media: dt-bindings: media: i2c: Add OV8865 bindings documentation")
> Fixes: 29a202fa7acc ("media: dt-bindings: media: i2c: Add OV5648 bindings documentation")
> Cc: Sakari Ailus <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Dave Stevenson <[email protected]>
> Cc: Jacopo Mondi <[email protected]>
> Cc: "Paul J. Murphy" <[email protected]>
> Cc: Daniele Alessandrelli <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Paul Kocialkowski <[email protected]>
> Cc: [email protected]
> Signed-off-by: Rob Herring <[email protected]>
> ---
> Please ack and I'll send to Linus for rc1.
>
> .../devicetree/bindings/media/i2c/imx258.yaml | 14 +++++++-------
> .../bindings/media/i2c/ovti,ov5647.yaml | 5 ++---
> .../bindings/media/i2c/ovti,ov5648.yaml | 16 +++++-----------
> .../bindings/media/i2c/ovti,ov8865.yaml | 16 +++++-----------
> .../bindings/media/i2c/sony,imx334.yaml | 11 +++++------
> 5 files changed, 24 insertions(+), 38 deletions(-)

Thanks for addressing this.

Acked-by: Sakari Ailus <[email protected]>

--
Kind regards,

Sakari Ailus

2021-02-24 15:31:48

by Krzysztof Kozlowski

Subject: Re: [PATCH] dt-bindings: media: Use graph and video-interfaces schemas, round 2

On Tue, 23 Feb 2021 at 22:02, Rob Herring <[email protected]> wrote:
>
> 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: 41b3e23376e9 ("media: dt-bindings: media: Add bindings for imx334")
> Fixes: d899e5f1db7a ("media: dt-bindings: media: imx258: add bindings for IMX258 sensor")
> Fixes: 918b866edfec ("media: dt-bindings: Remove old ov5647.yaml file, update ovti,ov5647.yaml")
> Fixes: 22f2b47517a6 ("media: dt-bindings: media: i2c: Add OV8865 bindings documentation")
> Fixes: 29a202fa7acc ("media: dt-bindings: media: i2c: Add OV5648 bindings documentation")
> Cc: Sakari Ailus <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Dave Stevenson <[email protected]>
> Cc: Jacopo Mondi <[email protected]>
> Cc: "Paul J. Murphy" <[email protected]>
> Cc: Daniele Alessandrelli <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Paul Kocialkowski <[email protected]>
> Cc: [email protected]
> Signed-off-by: Rob Herring <[email protected]>
> ---
> Please ack and I'll send to Linus for rc1.
>
> .../devicetree/bindings/media/i2c/imx258.yaml | 14 +++++++-------

Acked-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof