Skip to content

Commit 0cdee26

Browse files
torvaldstorvalds
committed
Merge tag 'media/v6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - v4l2 core: - sub-device framework routing improvements - NV12M tiled variants added to v4l2_format_info - some fixes at control handler freeing logic - fixed H264 SEPARATE_COLOUR_PLANE check - new staging driver: Intel IPU7 PCI - Rockchip video decoder driver got promoted from staging - iris: added HEVC/VP9 encoder/decoder support - vsp1: driver has gained Renesas VSPX support - uvc: - switched to vb2 ioctl helpers - added MSXU 1.5 metadata support - atomisp: GC0310 sensor driver cleanups in preparation for moving it out of staging - Lots of cleanup, fixes and improvements * tag 'media/v6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (310 commits) media: rkvdec: Unstage the driver media: rkvdec: Remove TODO file media: dt-bindings: rockchip: Add RK3576 Video Decoder bindings media: dt-bindings: rockchip: Document RK3588 Video Decoder bindings media: amphion: Support dmabuf and v4l2 buffer without binding media: verisilicon: postproc: 4K support media: v4l2: Add support for NV12M tiled variants to v4l2_format_info() media: uvcvideo: Use a count variable for meta_formats instead of 0 terminating media: uvcvideo: Auto-set UVC_QUIRK_MSXU_META media: uvcvideo: Introduce V4L2_META_FMT_UVC_MSXU_1_5 media: uvcvideo: Introduce dev->meta_formats media: Documentation: Add note about UVCH length field media: uvcvideo: Do not mark valid metadata as invalid media: uvcvideo: uvc_v4l2_unlocked_ioctl: Invert PM logic media: core: export v4l2_translate_cmd media: uvcvideo: Turn on the camera if V4L2_EVENT_SUB_FL_SEND_INITIAL media: uvcvideo: Remove stream->is_streaming field media: uvcvideo: Split uvc_stop_streaming() media: uvcvideo: Handle locks in uvc_queue_return_buffers media: uvcvideo: Use vb2 ioctl and fop helpers ...
2 parents 2715260 + d968e50 commit 0cdee26

File tree

314 files changed

+23131
-4600
lines changed

Some content is hidden

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

314 files changed

+23131
-4600
lines changed

‎.mailmap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,9 @@ Gustavo Padovan <[email protected]>
287287
Hamza Mahfooz <[email protected]> <[email protected]>
288288
Hanjun Guo <[email protected]> <[email protected]>
289289
Hans de Goede <[email protected]> <[email protected]>
290-
Hans Verkuil <[email protected]> <[email protected]>
291-
Hans Verkuil <[email protected]> <[email protected]>
290+
Hans Verkuil <[email protected]> <[email protected]>
291+
Hans Verkuil <[email protected]> <[email protected]>
292+
Hans Verkuil <[email protected]> <[email protected]>
292293
Harry Yoo <[email protected]> <[email protected]>
293294
Heiko Carstens <[email protected]> <[email protected]>
294295
Heiko Carstens <[email protected]> <[email protected]>

‎Documentation/devicetree/bindings/media/cdns,csi2rx.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ properties:
2424
reg:
2525
maxItems: 1
2626

27+
interrupts:
28+
maxItems: 2
29+
30+
interrupt-names:
31+
items:
32+
- const: error_irq
33+
- const: irq
34+
2735
clocks:
2836
items:
2937
- description: CSI2Rx system clock

‎Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/fsl,imx6q-vdoa.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale Video Data Order Adapter
8+
9+
description:
10+
The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose
11+
is to reorder video data from the macroblock tiled order produced by the CODA
12+
960 VPU to the conventional raster-scan order for scanout.
13+
14+
maintainers:
15+
- Frank Li <[email protected]>
16+
17+
properties:
18+
compatible:
19+
const: "fsl,imx6q-vdoa"
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
#include <dt-bindings/interrupt-controller/irq.h>
35+
#include <dt-bindings/clock/imx6qdl-clock.h>
36+
37+
vdoa@21e4000 {
38+
compatible = "fsl,imx6q-vdoa";
39+
reg = <0x021e4000 0x4000>;
40+
interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
41+
clocks = <&clks IMX6QDL_CLK_VDOA>;
42+
};

‎Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/fsl,imx8qm-isi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: i.MX8QM Image Sensing Interface
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
description:
13+
The Image Sensing Interface (ISI) combines image processing pipelines with
14+
DMA engines to process and capture frames originating from a variety of
15+
sources. The inputs to the ISI go through Pixel Link interfaces, and their
16+
number and nature is SoC-dependent. They cover both capture interfaces (MIPI
17+
CSI-2 RX, HDMI RX, ...) and display engine outputs for writeback support.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- fsl,imx8qm-isi
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 8
29+
30+
clock-names:
31+
items:
32+
- const: per0
33+
- const: per1
34+
- const: per2
35+
- const: per3
36+
- const: per4
37+
- const: per5
38+
- const: per6
39+
- const: per7
40+
41+
interrupts:
42+
maxItems: 8
43+
44+
power-domains:
45+
maxItems: 8
46+
47+
ports:
48+
$ref: /schemas/graph.yaml#/properties/ports
49+
properties:
50+
port@2:
51+
$ref: /schemas/graph.yaml#/properties/port
52+
description: MIPI CSI-2 RX 0
53+
port@3:
54+
$ref: /schemas/graph.yaml#/properties/port
55+
description: MIPI CSI-2 RX 1
56+
port@4:
57+
$ref: /schemas/graph.yaml#/properties/port
58+
description: HDMI RX
59+
60+
required:
61+
- compatible
62+
- reg
63+
- clocks
64+
- clock-names
65+
- interrupts
66+
- power-domains
67+
- ports
68+
69+
additionalProperties: false
70+
71+
examples:
72+
- |
73+
#include <dt-bindings/interrupt-controller/arm-gic.h>
74+
#include <dt-bindings/interrupt-controller/irq.h>
75+
#include <dt-bindings/clock/imx8-clock.h>
76+
#include <dt-bindings/clock/imx8-lpcg.h>
77+
#include <dt-bindings/firmware/imx/rsrc.h>
78+
79+
image-controller@58100000 {
80+
compatible = "fsl,imx8qm-isi";
81+
reg = <0x58100000 0x80000>;
82+
interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
83+
<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>,
84+
<GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>,
85+
<GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>,
86+
<GIC_SPI 301 IRQ_TYPE_LEVEL_HIGH>,
87+
<GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
88+
<GIC_SPI 303 IRQ_TYPE_LEVEL_HIGH>,
89+
<GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>;
90+
clocks = <&pdma0_lpcg IMX_LPCG_CLK_0>,
91+
<&pdma1_lpcg IMX_LPCG_CLK_0>,
92+
<&pdma2_lpcg IMX_LPCG_CLK_0>,
93+
<&pdma3_lpcg IMX_LPCG_CLK_0>,
94+
<&pdma4_lpcg IMX_LPCG_CLK_0>,
95+
<&pdma5_lpcg IMX_LPCG_CLK_0>,
96+
<&pdma6_lpcg IMX_LPCG_CLK_0>,
97+
<&pdma7_lpcg IMX_LPCG_CLK_0>;
98+
clock-names = "per0", "per1", "per2", "per3",
99+
"per4", "per5", "per6", "per7";
100+
power-domains = <&pd IMX_SC_R_ISI_CH0>, <&pd IMX_SC_R_ISI_CH1>,
101+
<&pd IMX_SC_R_ISI_CH2>, <&pd IMX_SC_R_ISI_CH3>,
102+
<&pd IMX_SC_R_ISI_CH4>, <&pd IMX_SC_R_ISI_CH5>,
103+
<&pd IMX_SC_R_ISI_CH6>, <&pd IMX_SC_R_ISI_CH7>;
104+
105+
ports {
106+
#address-cells = <1>;
107+
#size-cells = <0>;
108+
109+
port@2 {
110+
reg = <2>;
111+
endpoint {
112+
remote-endpoint = <&mipi_csi0_out>;
113+
};
114+
};
115+
};
116+
};
117+
...

‎Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/fsl,imx8qxp-isi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: i.MX8QXP Image Sensing Interface
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
description:
13+
The Image Sensing Interface (ISI) combines image processing pipelines with
14+
DMA engines to process and capture frames originating from a variety of
15+
sources. The inputs to the ISI go through Pixel Link interfaces, and their
16+
number and nature is SoC-dependent. They cover both capture interfaces (MIPI
17+
CSI-2 RX, HDMI RX, ...) and display engine outputs for writeback support.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- fsl,imx8qxp-isi
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 6
29+
30+
clock-names:
31+
items:
32+
- const: per0
33+
- const: per1
34+
- const: per2
35+
- const: per3
36+
- const: per4
37+
- const: per5
38+
39+
interrupts:
40+
maxItems: 6
41+
42+
power-domains:
43+
maxItems: 6
44+
45+
ports:
46+
$ref: /schemas/graph.yaml#/properties/ports
47+
properties:
48+
port@2:
49+
$ref: /schemas/graph.yaml#/properties/port
50+
description: MIPI CSI-2 RX 0
51+
port@6:
52+
$ref: /schemas/graph.yaml#/properties/port
53+
description: CSI-2 Parallel RX
54+
55+
required:
56+
- compatible
57+
- reg
58+
- clocks
59+
- clock-names
60+
- interrupts
61+
- power-domains
62+
- ports
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
#include <dt-bindings/interrupt-controller/irq.h>
70+
#include <dt-bindings/clock/imx8-clock.h>
71+
#include <dt-bindings/clock/imx8-lpcg.h>
72+
#include <dt-bindings/firmware/imx/rsrc.h>
73+
74+
image-controller@58100000 {
75+
compatible = "fsl,imx8qxp-isi";
76+
reg = <0x58100000 0x60000>;
77+
interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
78+
<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>,
79+
<GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>,
80+
<GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>,
81+
<GIC_SPI 301 IRQ_TYPE_LEVEL_HIGH>,
82+
<GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>;
83+
clocks = <&pdma0_lpcg IMX_LPCG_CLK_0>,
84+
<&pdma1_lpcg IMX_LPCG_CLK_0>,
85+
<&pdma2_lpcg IMX_LPCG_CLK_0>,
86+
<&pdma3_lpcg IMX_LPCG_CLK_0>,
87+
<&pdma4_lpcg IMX_LPCG_CLK_0>,
88+
<&pdma5_lpcg IMX_LPCG_CLK_0>;
89+
clock-names = "per0", "per1", "per2", "per3", "per4", "per5";
90+
power-domains = <&pd IMX_SC_R_ISI_CH0>, <&pd IMX_SC_R_ISI_CH1>,
91+
<&pd IMX_SC_R_ISI_CH2>, <&pd IMX_SC_R_ISI_CH3>,
92+
<&pd IMX_SC_R_ISI_CH4>, <&pd IMX_SC_R_ISI_CH5>;
93+
94+
ports {
95+
#address-cells = <1>;
96+
#size-cells = <0>;
97+
98+
port@2 {
99+
reg = <2>;
100+
endpoint {
101+
remote-endpoint = <&mipi_csi0_out>;
102+
};
103+
};
104+
};
105+
};
106+
...

‎Documentation/devicetree/bindings/media/fsl-vdoa.txt

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

‎Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ description:
2323
More detailed documentation can be found in
2424
Documentation/devicetree/bindings/media/video-interfaces.txt .
2525

26+
allOf:
27+
- $ref: /schemas/media/video-interface-devices.yaml#
28+
2629
properties:
2730
compatible:
2831
oneOf:
@@ -58,16 +61,10 @@ properties:
5861
documentation.
5962
maxItems: 1
6063

61-
flash-leds:
62-
description: Flash LED phandles. See ../video-interfaces.txt for details.
63-
64-
lens-focus:
65-
description: Lens focus controller phandles. See ../video-interfaces.txt
66-
for details.
64+
flash-leds: true
65+
lens-focus: true
6766

6867
rotation:
69-
description: Rotation of the sensor. See ../video-interfaces.txt for
70-
details.
7168
enum: [ 0, 180 ]
7269

7370
port:

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ properties:
7070
- bus-type
7171
- link-frequencies
7272

73+
slew-rate:
74+
$ref: /schemas/types.yaml#/definitions/uint32
75+
description:
76+
Slew rate ot the output pads DOUT[7:0], LINE_VALID, FRAME_VALID and
77+
PIXCLK. Higher values imply steeper voltage-flanks on the pads.
78+
minimum: 0
79+
maximum: 7
80+
default: 7
81+
7382
required:
7483
- compatible
7584
- reg

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ description: |
1515
controlled through an I2C-compatible SCCB bus. The sensor transmits images
1616
on a MIPI CSI-2 output interface with up to 4 data lanes.
1717
18+
$ref: /schemas/media/video-interface-devices.yaml#
19+
1820
properties:
1921
compatible:
2022
const: ovti,ov8858
@@ -69,7 +71,7 @@ required:
6971
- clocks
7072
- port
7173

72-
additionalProperties: false
74+
unevaluatedProperties: false
7375

7476
examples:
7577
- |

0 commit comments

Comments
 (0)