Skip to content

Commit 44ade29

Browse files
committed
media: dt-bindings: Merge OV5695 into OV5693 binding
The OV5695 binding is almost the same as the OV5693 binding. The only difference is 'clock-names' is defined for OV5695. However, the lack of clock-names is an omission as the Linux OV5693 driver expects the same 'xvclk' clock name. 'link-frequencies' is required by OV5693, but not OV5695, so make that conditional. Really, this shouldn't vary by device, but we're stuck with the existing binding use. The rockchip-isp1 binding example is missing required properties, so it has to be updated as well. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230817202647.2179609-1-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent cf60ce9 commit 44ade29

File tree

3 files changed

+25
-48
lines changed

3 files changed

+25
-48
lines changed

Documentation/devicetree/bindings/media/i2c/ov5695.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,41 @@
55
$id: http://devicetree.org/schemas/media/i2c/ovti,ov5693.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

8-
title: Omnivision OV5693 CMOS Sensor
8+
title: Omnivision OV5693/OV5695 CMOS Sensors
99

1010
maintainers:
1111
- Tommaso Merciai <tommaso.merciai@amarulasolutions.com>
1212

1313
description: |
14-
The Omnivision OV5693 is a high performance, 1/4-inch, 5 megapixel, CMOS
15-
image sensor that delivers 2592x1944 at 30fps. It provides full-frame,
14+
The Omnivision OV5693/OV5695 are high performance, 1/4-inch, 5 megapixel, CMOS
15+
image sensors that deliver 2592x1944 at 30fps. It provides full-frame,
1616
sub-sampled, and windowed 10-bit MIPI images in various formats via the
1717
Serial Camera Control Bus (SCCB) interface.
1818
19-
OV5693 is controlled via I2C and two-wire Serial Camera Control Bus (SCCB).
20-
The sensor output is available via CSI-2 serial data output (up to 2-lane).
19+
OV5693/OV5695 are controlled via I2C and two-wire Serial Camera Control Bus
20+
(SCCB). The sensor output is available via CSI-2 serial data output (up to
21+
2-lane).
2122
2223
allOf:
2324
- $ref: /schemas/media/video-interface-devices.yaml#
25+
- if:
26+
properties:
27+
compatible:
28+
contains:
29+
const: ovti,ov5693
30+
then:
31+
properties:
32+
port:
33+
properties:
34+
endpoint:
35+
required:
36+
- link-frequencies
2437

2538
properties:
2639
compatible:
27-
const: ovti,ov5693
40+
enum:
41+
- ovti,ov5693
42+
- ovti,ov5695
2843

2944
reg:
3045
maxItems: 1
@@ -34,6 +49,9 @@ properties:
3449
System input clock (aka XVCLK). From 6 to 27 MHz.
3550
maxItems: 1
3651

52+
clock-names:
53+
const: xvclk
54+
3755
dovdd-supply:
3856
description:
3957
Digital I/O voltage supply, 1.8V.
@@ -72,7 +90,6 @@ properties:
7290

7391
required:
7492
- data-lanes
75-
- link-frequencies
7693

7794
required:
7895
- compatible

Documentation/devicetree/bindings/media/rockchip-isp1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ examples:
199199
wcam: camera@36 {
200200
compatible = "ovti,ov5695";
201201
reg = <0x36>;
202+
clocks = <&cru SCLK_TESTCLKOUT1>;
202203
203204
port {
204205
wcam_out: endpoint {

0 commit comments

Comments
 (0)