Skip to content

Commit 73d21a3

Browse files
committed
Merge tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - New driver for SK Hynix Hi-846 8M pixel camera - New driver for the ov13b10 camera - New driver for Renesas R-Car ISP - mtk-vcodec gained support for version 2 of decoder firmware ABI - The legacy sir_ir driver got removed - videobuf2: the vb2_mem_ops kAPI had some improvements - lots of cleanups, fixes and new features at device drivers * tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (328 commits) media: venus: core: Add sdm660 DT compatible and resource struct media: dt-bindings: media: venus: Add sdm660 dt schema media: venus: vdec: decoded picture buffer handling during reconfig sequence media: venus: Handle fatal errors during encoding and decoding media: venus: helpers: Add helper to mark fatal vb2 error media: venus: hfi: Check for sys error on session hfi functions media: venus: Make sys_error flag an atomic bitops media: venus: venc: Use pmruntime autosuspend media: allegro: write vui parameters for HEVC media: allegro: nal-hevc: implement generator for vui media: allegro: write correct colorspace into SPS media: allegro: extract nal value lookup functions to header media: allegro: correctly scale the bit rate in SPS media: allegro: remove external QP table media: allegro: fix row and column in response message media: allegro: add control to disable encoder buffer media: allegro: add encoder buffer support media: allegro: add pm_runtime support media: allegro: lookup VCU settings media: allegro: fix module removal if initialization failed ...
2 parents 6f2b76a + 57c3b9f commit 73d21a3

File tree

341 files changed

+14209
-4856
lines changed

Some content is hidden

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

341 files changed

+14209
-4856
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Douglas Gilbert <[email protected]>
100100
Ed L. Cashin <[email protected]>
101101
102102
Evgeniy Polyakov <[email protected]>
103+
103104
Felipe W Damasio <[email protected]>
104105
Felix Kuhling <[email protected]>
105106
Felix Moeller <[email protected]>

Documentation/admin-guide/media/i2c-cardlist.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,20 @@ Camera sensor devices
5858
============ ==========================================================
5959
Driver Name
6060
============ ==========================================================
61+
ccs MIPI CCS compliant camera sensors (also SMIA++ and SMIA)
6162
et8ek8 ET8EK8 camera sensor
6263
hi556 Hynix Hi-556 sensor
64+
hi846 Hynix Hi-846 sensor
65+
imx208 Sony IMX208 sensor
6366
imx214 Sony IMX214 sensor
6467
imx219 Sony IMX219 sensor
6568
imx258 Sony IMX258 sensor
6669
imx274 Sony IMX274 sensor
6770
imx290 Sony IMX290 sensor
6871
imx319 Sony IMX319 sensor
72+
imx334 Sony IMX334 sensor
6973
imx355 Sony IMX355 sensor
74+
imx412 Sony IMX412 sensor
7075
m5mols Fujitsu M-5MOLS 8MP sensor
7176
mt9m001 mt9m001
7277
mt9m032 MT9M032 camera sensor
@@ -79,6 +84,7 @@ mt9v032 Micron MT9V032 sensor
7984
mt9v111 Aptina MT9V111 sensor
8085
noon010pc30 Siliconfile NOON010PC30 sensor
8186
ov13858 OmniVision OV13858 sensor
87+
ov13b10 OmniVision OV13B10 sensor
8288
ov2640 OmniVision OV2640 sensor
8389
ov2659 OmniVision OV2659 sensor
8490
ov2680 OmniVision OV2680 sensor
@@ -104,7 +110,6 @@ s5k4ecgx Samsung S5K4ECGX sensor
104110
s5k5baf Samsung S5K5BAF sensor
105111
s5k6a3 Samsung S5K6A3 sensor
106112
s5k6aa Samsung S5K6AAFX sensor
107-
smiapp SMIA++/SMIA sensor
108113
sr030pc30 Siliconfile SR030PC30 sensor
109114
vs6624 ST VS6624 sensor
110115
============ ==========================================================
@@ -138,6 +143,7 @@ Driver Name
138143
ad5820 AD5820 lens voice coil
139144
ak7375 AK7375 lens voice coil
140145
dw9714 DW9714 lens voice coil
146+
dw9768 DW9768 lens voice coil
141147
dw9807-vcm DW9807 lens voice coil
142148
============ ==========================================================
143149

Documentation/admin-guide/media/imx7.rst

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,66 @@ the resolutions supported by the sensor.
155155
[fmt:SBGGR10_1X10/800x600@1/30 field:none colorspace:srgb]
156156
-> "imx7-mipi-csis.0":0 [ENABLED]
157157
158+
i.MX6ULL-EVK with OV5640
159+
------------------------
160+
161+
On this platform a parallel OV5640 sensor is connected to the CSI port.
162+
The following example configures a video capture pipeline with an output
163+
of 640x480 and UYVY8_2X8 format:
164+
165+
.. code-block:: none
166+
167+
# Setup links
168+
media-ctl -l "'ov5640 1-003c':0 -> 'csi':0[1]"
169+
media-ctl -l "'csi':1 -> 'csi capture':0[1]"
170+
171+
# Configure pads for pipeline
172+
media-ctl -v -V "'ov5640 1-003c':0 [fmt:UYVY8_2X8/640x480 field:none]"
173+
174+
After this streaming can start:
175+
176+
.. code-block:: none
177+
178+
gst-launch-1.0 -v v4l2src device=/dev/video1 ! video/x-raw,format=UYVY,width=640,height=480 ! v4l2convert ! fbdevsink
179+
180+
.. code-block:: none
181+
182+
# media-ctl -p
183+
Media controller API version 5.14.0
184+
185+
Media device information
186+
------------------------
187+
driver imx7-csi
188+
model imx-media
189+
serial
190+
bus info
191+
hw revision 0x0
192+
driver version 5.14.0
193+
194+
Device topology
195+
- entity 1: csi (2 pads, 2 links)
196+
type V4L2 subdev subtype Unknown flags 0
197+
device node name /dev/v4l-subdev0
198+
pad0: Sink
199+
[fmt:UYVY8_2X8/640x480 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
200+
<- "ov5640 1-003c":0 [ENABLED,IMMUTABLE]
201+
pad1: Source
202+
[fmt:UYVY8_2X8/640x480 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
203+
-> "csi capture":0 [ENABLED,IMMUTABLE]
204+
205+
- entity 4: csi capture (1 pad, 1 link)
206+
type Node subtype V4L flags 0
207+
device node name /dev/video1
208+
pad0: Sink
209+
<- "csi":1 [ENABLED,IMMUTABLE]
210+
211+
- entity 10: ov5640 1-003c (1 pad, 1 link)
212+
type V4L2 subdev subtype Sensor flags 0
213+
device node name /dev/v4l-subdev1
214+
pad0: Source
215+
[fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
216+
-> "csi":0 [ENABLED,IMMUTABLE]
217+
158218
References
159219
----------
160220

Documentation/admin-guide/media/ipu3.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ to userspace as a V4L2 sub-device node and has two pads:
5151
.. tabularcolumns:: |p{0.8cm}|p{4.0cm}|p{4.0cm}|
5252

5353
.. flat-table::
54+
:header-rows: 1
5455

55-
* - pad
56-
- direction
57-
- purpose
56+
* - Pad
57+
- Direction
58+
- Purpose
5859

5960
* - 0
6061
- sink
@@ -148,10 +149,11 @@ Each pipe has two sink pads and three source pads for the following purpose:
148149
.. tabularcolumns:: |p{0.8cm}|p{4.0cm}|p{4.0cm}|
149150

150151
.. flat-table::
152+
:header-rows: 1
151153

152-
* - pad
153-
- direction
154-
- purpose
154+
* - Pad
155+
- Direction
156+
- Purpose
155157

156158
* - 0
157159
- sink

Documentation/admin-guide/media/ivtv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ whatever). Otherwise the device numbers can get confusing. The ivtv
159159
Read-only
160160

161161
The raw YUV video output from the current video input. The YUV format
162-
is non-standard (V4L2_PIX_FMT_HM12).
162+
is a 16x16 linear tiled NV12 format (V4L2_PIX_FMT_NV12_16L16)
163163

164164
Note that the YUV and PCM streams are not synchronized, so they are of
165165
limited use.

Documentation/admin-guide/media/vimc.rst

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ vimc-debayer:
6161
* 1 Pad source
6262

6363
vimc-scaler:
64-
Scale up the image by a factor of 3. E.g.: a 640x480 image becomes a
65-
1920x1440 image. (this value can be configured, see at
66-
`Module options`_).
64+
Re-size the image to meet the source pad resolution. E.g.: if the sync
65+
pad is configured to 360x480 and the source to 1280x720, the image will
66+
be stretched to fit the source resolution. Works for any resolution
67+
within the vimc limitations (even shrinking the image if necessary).
6768
Exposes:
6869

6970
* 1 Pad sink
@@ -75,16 +76,3 @@ vimc-capture:
7576

7677
* 1 Pad sink
7778
* 1 Pad source
78-
79-
80-
Module options
81-
--------------
82-
83-
Vimc has a module parameter to configure the driver.
84-
85-
* ``sca_mult=<unsigned int>``
86-
87-
Image size multiplier factor to be used to multiply both width and
88-
height, so the image size will be ``sca_mult^2`` bigger than the
89-
original one. Currently, only supports scaling up (the default value
90-
is 3).

Documentation/devicetree/bindings/media/i2c/adv7604.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44
$id: http://devicetree.org/schemas/media/i2c/adv7604.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Analog Devices ADV7604/11/12 video decoder with HDMI receiver
7+
title: Analog Devices ADV7604/10/11/12 video decoder with HDMI receiver
88

99
maintainers:
1010
- Hans Verkuil <[email protected]>
1111

1212
description:
13-
The ADV7604 and ADV7611/12 are multiformat video decoders with an integrated
14-
HDMI receiver. The ADV7604 has four multiplexed HDMI inputs and one analog
15-
input, and the ADV7611 has one HDMI input and no analog input. The 7612 is
16-
similar to the 7611 but has 2 HDMI inputs.
13+
The ADV7604 and ADV7610/11/12 are multiformat video decoders with
14+
an integrated HDMI receiver. The ADV7604 has four multiplexed HDMI inputs
15+
and one analog input, and the ADV7610/11 have one HDMI input and no analog
16+
input. The ADV7612 is similar to the ADV7610/11 but has 2 HDMI inputs.
1717

18-
These device tree bindings support the ADV7611/12 only at the moment.
18+
These device tree bindings support the ADV7610/11/12 only at the moment.
1919

2020
properties:
2121
compatible:
2222
items:
2323
- enum:
24+
- adi,adv7610
2425
- adi,adv7611
2526
- adi,adv7612
2627

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
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/aptina,mt9p031.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
8+
9+
maintainers:
10+
- Laurent Pinchart <[email protected]>
11+
12+
description: |
13+
The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor
14+
with an active array size of 2592H x 1944V. It is programmable through a
15+
simple two-wire serial interface.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- aptina,mt9p031
21+
- aptina,mt9p031m
22+
23+
reg:
24+
description: I2C device address
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
vdd-supply:
31+
description: Digital supply voltage, 1.8 V
32+
33+
vdd_io-supply:
34+
description: I/O supply voltage, 1.8 or 2.8 V
35+
36+
vaa-supply:
37+
description: Analog supply voltage, 2.8 V
38+
39+
reset-gpios:
40+
maxItems: 1
41+
description: Chip reset GPIO
42+
43+
port:
44+
$ref: /schemas/graph.yaml#/$defs/port-base
45+
additionalProperties: false
46+
47+
properties:
48+
endpoint:
49+
$ref: /schemas/media/video-interfaces.yaml#
50+
unevaluatedProperties: false
51+
52+
properties:
53+
input-clock-frequency:
54+
$ref: /schemas/types.yaml#/definitions/uint32
55+
minimum: 6000000
56+
maximum: 96000000
57+
description: Input clock frequency
58+
59+
pixel-clock-frequency:
60+
$ref: /schemas/types.yaml#/definitions/uint32
61+
maximum: 96000000
62+
description: Target pixel clock frequency
63+
64+
pclk-sample:
65+
default: 0
66+
67+
required:
68+
- input-clock-frequency
69+
- pixel-clock-frequency
70+
71+
required:
72+
- compatible
73+
- reg
74+
- clocks
75+
- vdd-supply
76+
- vdd_io-supply
77+
- vaa-supply
78+
- port
79+
80+
additionalProperties: false
81+
82+
examples:
83+
- |
84+
i2c0 {
85+
#address-cells = <1>;
86+
#size-cells = <0>;
87+
88+
mt9p031@5d {
89+
compatible = "aptina,mt9p031";
90+
reg = <0x5d>;
91+
reset-gpios = <&gpio_sensor 0 0>;
92+
93+
clocks = <&sensor_clk>;
94+
95+
vdd-supply = <&reg_vdd>;
96+
vdd_io-supply = <&reg_vdd_io>;
97+
vaa-supply = <&reg_vaa>;
98+
99+
port {
100+
mt9p031_1: endpoint {
101+
input-clock-frequency = <6000000>;
102+
pixel-clock-frequency = <96000000>;
103+
};
104+
};
105+
};
106+
};
107+
108+
...

0 commit comments

Comments
 (0)