Skip to content

Commit 835d31d

Browse files
torvaldstorvalds
committed
Merge tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - new sensor drivers: imx335, imx412, ov9282 - new IR transmitter driver: meson-ir-tx - handro driver gained support for H.264 for Rockchip VDPU2 - imx gained support for i.MX8MQ - ti-vpe has gained support for other SoC variants - lots of cleanups, fixes, board additions and doc improvements * tag 'media/v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (195 commits) media: venus: venc: add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control media: venus: venc: Add support for intra-refresh period media: v4l2-ctrls: Add intra-refresh period control media: docs: ext-ctrls-codec: Document cyclic intra-refresh zero control value media: venus: helper: do not set constrained parameters for UBWC media: venus: venc: Fix potential null pointer dereference on pointer fmt media: venus: hfi: fix return value check in sys_get_prop_image_version() media: tegra-cec: Handle errors of clk_prepare_enable() media: cec-pin: rename timer overrun variables media: TDA1997x: report -ENOLINK after disconnecting HDMI source media: TDA1997x: fix tda1997x_query_dv_timings() return value media: Fix cosmetic error in TDA1997x driver media: v4l2-dv-timings.c: fix wrong condition in two for-loops media: imx: add a driver for i.MX8MQ mipi csi rx phy and controller media: dt-bindings: media: document the nxp,imx8mq-mipi-csi2 receiver phy and controller media: imx: imx7_mipi_csis: convert some switch cases to the default media: imx: imx7-media-csi: Fix buffer return upon stream start failure media: imx: imx7-media-csi: Don't set PIXEL_BIT in CSICR1 media: imx: imx7-media-csi: Set TWO_8BIT_SENSOR for >= 10-bit formats media: dt-bindings: media: nxp,imx7-csi: Add i.MX8MM support ...
2 parents 0d29022 + 9c3a0f2 commit 835d31d

File tree

150 files changed

+7973
-1339
lines changed

Some content is hidden

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

150 files changed

+7973
-1339
lines changed

‎Documentation/devicetree/bindings/media/amlogic,meson-ir-tx.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/media/amlogic,meson-ir-tx.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: Amlogic Meson IR transmitter
9+
10+
maintainers:
11+
- Viktor Prutyanov <[email protected]>
12+
13+
description: |
14+
Some Amlogic SoCs such as A311D and T950D4 have IR transmitter
15+
(also called blaster) controller onboard. It is capable of
16+
sending IR signals with arbitrary carrier frequency and duty cycle.
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- const: amlogic,meson-ir-tx
22+
- items:
23+
- const: amlogic,meson-g12a-ir-tx
24+
- const: amlogic,meson-ir-tx
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
clocks:
33+
maxItems: 2
34+
35+
clock-names:
36+
items:
37+
- const: sysclk
38+
- const: xtal
39+
40+
required:
41+
- compatible
42+
- reg
43+
- interrupts
44+
- clocks
45+
- clock-names
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/irq.h>
52+
#include <dt-bindings/clock/g12a-clkc.h>
53+
54+
ir@ff80014c {
55+
compatible = "amlogic,meson-g12a-ir-tx", "amlogic,meson-ir-tx";
56+
reg = <0xff80014c 0x10>;
57+
interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;
58+
clocks = <&clkc CLKID_CLK81>, <&xtal>;
59+
clock-names = "sysclk", "xtal";
60+
};

‎Documentation/devicetree/bindings/media/i2c/adv7180.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ properties:
3535
powerdown-gpios:
3636
maxItems: 1
3737

38+
reset-gpios:
39+
maxItems: 1
40+
41+
adv,force-bt656-4:
42+
description:
43+
Indicates that the output is a BT.656-4 compatible stream.
44+
type: boolean
45+
3846
port:
3947
$ref: /schemas/graph.yaml#/$defs/port-base
4048
unevaluatedProperties: false

‎Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2021 Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/media/i2c/ovti,ov9282.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: OmniVision OV9282 Sensor
9+
10+
maintainers:
11+
- Paul J. Murphy <[email protected]>
12+
- Daniele Alessandrelli <[email protected]>
13+
14+
description:
15+
OV9282 sensor is an OmniVision black & white CMOS active pixel digital image
16+
sensor with an active array size of 1296H x 816V. It is programmable through
17+
I2C interface. The I2C client address is fixed to 0x60/0x70 as per sensor data
18+
sheet. Image data is sent through MIPI CSI-2.
19+
20+
properties:
21+
compatible:
22+
const: ovti,ov9282
23+
reg:
24+
description: I2C address
25+
maxItems: 1
26+
27+
assigned-clocks: true
28+
assigned-clock-parents: true
29+
assigned-clock-rates: true
30+
31+
clocks:
32+
description: Clock frequency from 6 to 27MHz
33+
maxItems: 1
34+
35+
reset-gpios:
36+
description: Reference to the GPIO connected to the XCLR pin, if any.
37+
maxItems: 1
38+
39+
port:
40+
additionalProperties: false
41+
$ref: /schemas/graph.yaml#/properties/port
42+
43+
properties:
44+
endpoint:
45+
$ref: /schemas/media/video-interfaces.yaml#
46+
unevaluatedProperties: false
47+
48+
properties:
49+
data-lanes: true
50+
link-frequencies: true
51+
52+
required:
53+
- data-lanes
54+
- link-frequencies
55+
56+
required:
57+
- endpoint
58+
59+
required:
60+
- compatible
61+
- reg
62+
- clocks
63+
- port
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
i2c0 {
70+
#address-cells = <1>;
71+
#size-cells = <0>;
72+
73+
camera@60 {
74+
compatible = "ovti,ov9282";
75+
reg = <0x60>;
76+
clocks = <&ov9282_clk>;
77+
78+
assigned-clocks = <&ov9282_clk>;
79+
assigned-clock-parents = <&ov9282_clk_parent>;
80+
assigned-clock-rates = <24000000>;
81+
82+
port {
83+
ov9282: endpoint {
84+
remote-endpoint = <&cam>;
85+
data-lanes = <1 2>;
86+
link-frequencies = /bits/ 64 <800000000>;
87+
};
88+
};
89+
};
90+
};
91+
...

‎Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2021 Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/media/i2c/sony,imx335.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Sony IMX335 Sensor
9+
10+
maintainers:
11+
- Paul J. Murphy <[email protected]>
12+
- Daniele Alessandrelli <[email protected]>
13+
14+
description:
15+
IMX335 sensor is a Sony CMOS active pixel digital image sensor with an active
16+
array size of 2592H x 1944V. It is programmable through I2C interface. The
17+
I2C client address is fixed to 0x1a as per sensor data sheet. Image data is
18+
sent through MIPI CSI-2.
19+
20+
properties:
21+
compatible:
22+
const: sony,imx335
23+
reg:
24+
description: I2C address
25+
maxItems: 1
26+
27+
assigned-clocks: true
28+
assigned-clock-parents: true
29+
assigned-clock-rates: true
30+
31+
clocks:
32+
description: Clock frequency from 6 to 27 MHz, 37.125MHz, 74.25MHz
33+
maxItems: 1
34+
35+
reset-gpios:
36+
description: Reference to the GPIO connected to the XCLR pin, if any.
37+
maxItems: 1
38+
39+
port:
40+
additionalProperties: false
41+
$ref: /schemas/graph.yaml#/properties/port
42+
43+
properties:
44+
endpoint:
45+
$ref: /schemas/media/video-interfaces.yaml#
46+
unevaluatedProperties: false
47+
48+
properties:
49+
data-lanes: true
50+
link-frequencies: true
51+
52+
required:
53+
- data-lanes
54+
- link-frequencies
55+
56+
required:
57+
- endpoint
58+
59+
required:
60+
- compatible
61+
- reg
62+
- clocks
63+
- port
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
i2c0 {
70+
#address-cells = <1>;
71+
#size-cells = <0>;
72+
73+
camera@1a {
74+
compatible = "sony,imx335";
75+
reg = <0x1a>;
76+
clocks = <&imx335_clk>;
77+
78+
assigned-clocks = <&imx335_clk>;
79+
assigned-clock-parents = <&imx335_clk_parent>;
80+
assigned-clock-rates = <24000000>;
81+
82+
port {
83+
imx335: endpoint {
84+
remote-endpoint = <&cam>;
85+
data-lanes = <1 2 3 4>;
86+
link-frequencies = /bits/ 64 <594000000>;
87+
};
88+
};
89+
};
90+
};
91+
...

‎Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2021 Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/media/i2c/sony,imx412.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Sony IMX412 Sensor
9+
10+
maintainers:
11+
- Paul J. Murphy <[email protected]>
12+
- Daniele Alessandrelli <[email protected]>
13+
14+
description:
15+
IMX412 sensor is a Sony CMOS active pixel digital image sensor with an active
16+
array size of 4072H x 3176V. It is programmable through I2C interface. The
17+
I2C client address is fixed to 0x1a as per sensor data sheet. Image data is
18+
sent through MIPI CSI-2.
19+
20+
properties:
21+
compatible:
22+
const: sony,imx412
23+
reg:
24+
description: I2C address
25+
maxItems: 1
26+
27+
assigned-clocks: true
28+
assigned-clock-parents: true
29+
assigned-clock-rates: true
30+
31+
clocks:
32+
description: Clock frequency 6MHz, 12MHz, 18MHz, 24MHz or 27MHz
33+
maxItems: 1
34+
35+
reset-gpios:
36+
description: Reference to the GPIO connected to the XCLR pin, if any.
37+
maxItems: 1
38+
39+
port:
40+
additionalProperties: false
41+
$ref: /schemas/graph.yaml#/properties/port
42+
43+
properties:
44+
endpoint:
45+
$ref: /schemas/media/video-interfaces.yaml#
46+
unevaluatedProperties: false
47+
48+
properties:
49+
data-lanes: true
50+
link-frequencies: true
51+
52+
required:
53+
- data-lanes
54+
- link-frequencies
55+
56+
required:
57+
- endpoint
58+
59+
required:
60+
- compatible
61+
- reg
62+
- clocks
63+
- port
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
i2c0 {
70+
#address-cells = <1>;
71+
#size-cells = <0>;
72+
73+
camera@1a {
74+
compatible = "sony,imx412";
75+
reg = <0x1a>;
76+
clocks = <&imx412_clk>;
77+
78+
assigned-clocks = <&imx412_clk>;
79+
assigned-clock-parents = <&imx412_clk_parent>;
80+
assigned-clock-rates = <24000000>;
81+
82+
port {
83+
imx412: endpoint {
84+
remote-endpoint = <&cam>;
85+
data-lanes = <1 2 3 4>;
86+
link-frequencies = /bits/ 64 <600000000>;
87+
};
88+
};
89+
};
90+
};
91+
...

‎Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/media/nxp,imx7-csi.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: i.MX7 CMOS Sensor Interface
7+
title: i.MX7 and i.MX8 CSI bridge (CMOS Sensor Interface)
88

99
maintainers:
1010
- Rui Miguel Silva <[email protected]>
@@ -15,9 +15,13 @@ description: |
1515
1616
properties:
1717
compatible:
18-
enum:
19-
- fsl,imx7-csi
20-
- fsl,imx6ul-csi
18+
oneOf:
19+
- enum:
20+
- fsl,imx7-csi
21+
- fsl,imx6ul-csi
22+
- items:
23+
- const: fsl,imx8mm-csi
24+
- const: fsl,imx7-csi
2125

2226
reg:
2327
maxItems: 1

0 commit comments

Comments
 (0)