Skip to content

Commit

Permalink
media: dt-bindings: Merge OV5695 into OV5693 binding
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring committed Sep 5, 2023
1 parent cf60ce9 commit 44ade29
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 48 deletions.
41 changes: 0 additions & 41 deletions Documentation/devicetree/bindings/media/i2c/ov5695.txt

This file was deleted.

31 changes: 24 additions & 7 deletions Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,41 @@
$id: http://devicetree.org/schemas/media/i2c/ovti,ov5693.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Omnivision OV5693 CMOS Sensor
title: Omnivision OV5693/OV5695 CMOS Sensors

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

description: |
The Omnivision OV5693 is a high performance, 1/4-inch, 5 megapixel, CMOS
image sensor that delivers 2592x1944 at 30fps. It provides full-frame,
The Omnivision OV5693/OV5695 are high performance, 1/4-inch, 5 megapixel, CMOS
image sensors that deliver 2592x1944 at 30fps. It provides full-frame,
sub-sampled, and windowed 10-bit MIPI images in various formats via the
Serial Camera Control Bus (SCCB) interface.
OV5693 is controlled via I2C and two-wire Serial Camera Control Bus (SCCB).
The sensor output is available via CSI-2 serial data output (up to 2-lane).
OV5693/OV5695 are controlled via I2C and two-wire Serial Camera Control Bus
(SCCB). The sensor output is available via CSI-2 serial data output (up to
2-lane).
allOf:
- $ref: /schemas/media/video-interface-devices.yaml#
- if:
properties:
compatible:
contains:
const: ovti,ov5693
then:
properties:
port:
properties:
endpoint:
required:
- link-frequencies

properties:
compatible:
const: ovti,ov5693
enum:
- ovti,ov5693
- ovti,ov5695

reg:
maxItems: 1
Expand All @@ -34,6 +49,9 @@ properties:
System input clock (aka XVCLK). From 6 to 27 MHz.
maxItems: 1

clock-names:
const: xvclk

dovdd-supply:
description:
Digital I/O voltage supply, 1.8V.
Expand Down Expand Up @@ -72,7 +90,6 @@ properties:

required:
- data-lanes
- link-frequencies

required:
- compatible
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/media/rockchip-isp1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ examples:
wcam: camera@36 {
compatible = "ovti,ov5695";
reg = <0x36>;
clocks = <&cru SCLK_TESTCLKOUT1>;
port {
wcam_out: endpoint {
Expand Down

0 comments on commit 44ade29

Please sign in to comment.