Skip to content

Commit 00c6649

Browse files
committed
Merge tag 'media/v7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - new CSI tegra support, covering Tegra20 and Tegra30 - new camera sensor drivers: T4ka3 and ov2732 - m88ds3103: add 3103c chip support - uvcvideo: add support for Intel RealSense D436/D555 and P010 pixel format - synopsys csi2rx: add i.MX93 support - imx8-isi: add i.MX95 support - imx8mq-mipi-csi2: add i.MX8ULP support - dw100: add V4L2 requests support - support for DTV devices from Hauppauge got some improvements - media staging: dropped starfive-camss driver - media docs: document multi-committers model and improve maint profile - media core: - add v4l2_subdev_get_frame_desc_passthrough() helper - improve error handling in fwnode parsing - lots of driver fixes, cleanups and improvements * tag 'media/v7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (251 commits) Revert "media: cx231xx: add USB ID 2040:8360 for Hauppauge WinTV-HVR-935" media: synopsys: csi2rx: add i.MX93 support media: dt-bindings: add NXP i.MX93 compatible string media: synopsys: csi2rx: Use enum and u32 array for register offsets media: synopsys: csi2rx: implement .get_frame_desc() callback media: synopsys: csi2rx: only check errors from devm_clk_bulk_get_all() media: synopsys: csi2rx: use devm_reset_control_get_optional_exclusive() media: i2c: imx283: add support for non-continuous MIPI clock mode media: i2c: ov08d10: add support for 24 MHz input clock media: i2c: ov08d10: add support for reset and power management media: i2c: ov08d10: add support for binding via device tree dt-bindings: media: i2c: document Omnivision OV08D10 CMOS image sensor media: i2c: ov08d10: add missing newline to prints media: i2c: ov08d10: fix some typos in comments media: i2c: ov08d10: remove duplicate register write media: i2c: ov08d10: fix image vertical start setting media: i2c: ov08d10: fix runtime PM handling in probe staging: media: ipu7: Update TODO media: Add t4ka3 camera sensor driver media: i2c: Add ov2732 image sensor driver ...
2 parents 1f5ffc6 + 4fbeef2 commit 00c6649

266 files changed

Lines changed: 10022 additions & 7106 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ Hans de Goede <[email protected]> <[email protected]>
317317
318318
319319
320+
320321
321322
322323

Documentation/admin-guide/media/mgb4.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Common FPDL3/GMSL input parameters
7474

7575
| 0 - OLDI/JEIDA
7676
| 1 - SPWG/VESA (default)
77+
| 2 - ZDML
7778
7879
**link_status** (R):
7980
Video link status. If the link is locked, chips are properly connected and
@@ -240,6 +241,13 @@ Common FPDL3/GMSL output parameters
240241
*Note: This parameter can not be changed while the output v4l2 device is
241242
open.*
242243

244+
**color_mapping** (RW):
245+
Mapping of the outgoing bits in the signal to the colour bits of the pixels.
246+
247+
| 0 - OLDI/JEIDA
248+
| 1 - SPWG/VESA (default)
249+
| 2 - ZDML
250+
243251
**frame_rate** (RW):
244252
Output video signal frame rate limit in frames per second. Due to
245253
the limited output pixel clock steps, the card can not always generate

Documentation/admin-guide/media/starfive_camss.rst

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

Documentation/admin-guide/media/starfive_camss_graph.dot

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

Documentation/admin-guide/media/v4l-drivers.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Video4Linux (V4L) driver-specific documentation
3333
si470x
3434
si4713
3535
si476x
36-
starfive_camss
3736
vimc
3837
visl
3938
vivid

Documentation/devicetree/bindings/media/i2c/alliedvision,alvium-csi2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allied Vision Alvium Camera
88

99
maintainers:
1010
- Tommaso Merciai <[email protected]>
11-
- Martin Hecht <[email protected]>
11+
- Martin Hecht <[email protected]>
1212

1313
allOf:
1414
- $ref: /schemas/media/video-interface-devices.yaml#

Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ description: |-
1717
1818
properties:
1919
compatible:
20-
const: onnn,mt9m114
20+
enum:
21+
- onnn,mt9m114
22+
- aptina,mi1040
2123

2224
reg:
2325
description: I2C device address
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/i2c/ovti,ov08d10.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Omnivision OV08D10 1/4-Inch 8MP CMOS color image sensor
8+
9+
maintainers:
10+
- Matthias Fend <[email protected]>
11+
12+
description:
13+
The Omnivision OV08D10 is a 1/4-Inch 8MP CMOS color image sensor with an
14+
active array size of 3280 x 2464. It is programmable through I2C
15+
interface. Image data is transmitted via MIPI CSI-2 using 2 lanes.
16+
17+
allOf:
18+
- $ref: /schemas/media/video-interface-devices.yaml#
19+
20+
properties:
21+
compatible:
22+
const: ovti,ov08d10
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
description: MCLK input clock (6 - 27 MHz)
29+
maxItems: 1
30+
31+
reset-gpios:
32+
description: Active low XSHUTDN pin
33+
maxItems: 1
34+
35+
dovdd-supply:
36+
description: IO power supply (1.8V)
37+
38+
avdd-supply:
39+
description: Analog power supply (2.8V)
40+
41+
dvdd-supply:
42+
description: Core power supply (1.2V)
43+
44+
port:
45+
$ref: /schemas/graph.yaml#/$defs/port-base
46+
additionalProperties: false
47+
48+
properties:
49+
endpoint:
50+
$ref: /schemas/media/video-interfaces.yaml#
51+
unevaluatedProperties: false
52+
53+
required:
54+
- data-lanes
55+
- link-frequencies
56+
57+
required:
58+
- endpoint
59+
60+
required:
61+
- compatible
62+
- reg
63+
- clocks
64+
- port
65+
66+
unevaluatedProperties: false
67+
68+
examples:
69+
- |
70+
#include <dt-bindings/gpio/gpio.h>
71+
#include <dt-bindings/media/video-interfaces.h>
72+
73+
i2c {
74+
#address-cells = <1>;
75+
#size-cells = <0>;
76+
77+
sensor@36 {
78+
compatible = "ovti,ov08d10";
79+
reg = <0x36>;
80+
81+
clocks = <&ov08d10_clk>;
82+
83+
dovdd-supply = <&ov08d10_vdddo_1v8>;
84+
avdd-supply = <&ov08d10_vdda_2v8>;
85+
dvdd-supply = <&ov08d10_vddd_1v2>;
86+
87+
orientation = <2>;
88+
rotation = <0>;
89+
90+
reset-gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
91+
92+
port {
93+
ov08d10_output: endpoint {
94+
data-lanes = <1 2>;
95+
link-frequencies = /bits/ 64 <360000000 720000000>;
96+
remote-endpoint = <&csi_input>;
97+
};
98+
};
99+
};
100+
};
101+
...
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/i2c/ovti,ov2732.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: OmniVision OV2732 Image Sensor
8+
9+
maintainers:
10+
- Walter Werner Schneider <[email protected]>
11+
12+
description:
13+
The OmniVision OV2732 is a 2MP (1920x1080) color CMOS image sensor controlled
14+
through an I2C-compatible SCCB bus.
15+
16+
properties:
17+
compatible:
18+
const: ovti,ov2732
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
items:
25+
- description: XVCLK clock
26+
27+
avdd-supply:
28+
description: Analog Domain Power Supply
29+
30+
dovdd-supply:
31+
description: I/O Domain Power Supply
32+
33+
dvdd-supply:
34+
description: Digital Domain Power Supply
35+
36+
powerdown-gpios:
37+
maxItems: 1
38+
description: Reference to the GPIO connected to the pwdn pin. Active low.
39+
40+
reset-gpios:
41+
maxItems: 1
42+
description: Reference to the GPIO connected to the reset pin. Active low.
43+
44+
port:
45+
description: MIPI CSI-2 transmitter port
46+
$ref: /schemas/graph.yaml#/$defs/port-base
47+
additionalProperties: false
48+
49+
properties:
50+
endpoint:
51+
$ref: /schemas/media/video-interfaces.yaml#
52+
unevaluatedProperties: false
53+
54+
properties:
55+
data-lanes:
56+
items:
57+
- const: 1
58+
- const: 2
59+
60+
required:
61+
- data-lanes
62+
- link-frequencies
63+
64+
required:
65+
- compatible
66+
- reg
67+
- clocks
68+
- avdd-supply
69+
- dovdd-supply
70+
- dvdd-supply
71+
- port
72+
73+
additionalProperties: false
74+
75+
examples:
76+
- |
77+
#include <dt-bindings/gpio/gpio.h>
78+
79+
i2c {
80+
#address-cells = <1>;
81+
#size-cells = <0>;
82+
83+
ov2732: camera@36 {
84+
compatible = "ovti,ov2732";
85+
reg = <0x36>;
86+
clocks = <&ov2732_clk>;
87+
88+
avdd-supply = <&ov2732_avdd>;
89+
dovdd-supply = <&ov2732_dovdd>;
90+
dvdd-supply = <&ov2732_dvdd>;
91+
92+
powerdown-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
93+
reset-gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
94+
95+
port {
96+
camera_out: endpoint {
97+
data-lanes = <1 2>;
98+
link-frequencies = /bits/ 64 <360000000>;
99+
remote-endpoint = <&mipi_in_camera>;
100+
};
101+
};
102+
};
103+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ description: |-
1818
through I2C and two-wire SCCB. The sensor output is available via CSI-2
1919
serial data output (up to 4-lane).
2020
21+
allOf:
22+
- $ref: /schemas/media/video-interface-devices.yaml#
23+
2124
properties:
2225
compatible:
2326
const: ovti,ov8856
@@ -57,6 +60,9 @@ properties:
5760
This corresponds to the hardware pin XSHUTDOWN which is physically
5861
active low.
5962

63+
orientation: true
64+
rotation: true
65+
6066
port:
6167
$ref: /schemas/graph.yaml#/$defs/port-base
6268
additionalProperties: false

0 commit comments

Comments
 (0)