Skip to content

Commit 9f5a6a1

Browse files
torvaldstorvalds
committed
Merge tag 'media/v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - removal of the old omap4iss media driver - mantis: remove orphan mantis_core.h - add support for Raspberypi CFE - uvc driver got a co-maintainer - main media tree moved to git://linuxtv.org/media.git - lots of driver cleanups, updates and fixes * tag 'media/v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (233 commits) docs: media: update location of the media patches MAINTAINERS: update location of media main tree media: MAINTAINERS: Add Hans de Goede as USB VIDEO CLASS co-maintainer media: platform: samsung: s5p-jpeg: Remove deadcode media: qcom: camss: Add MSM8953 resources media: dt-bindings: Add qcom,msm8953-camss media: qcom: camss: implement pm domain ops for VFE v4.1 media: platform: exynos4-is: Fix an OF node reference leak in fimc_md_is_isp_available media: adv7180: Also check for "adi,force-bt656-4" media: dt-bindings: adv7180: Document 'adi,force-bt656-4' media: mgb4: Fix inconsistent input/output alignment in loopback mode media: replace obsolete [email protected] alias Documentation: media: improve V4L2_CID_MIN_BUFFERS_FOR_*, doc media: vicodec: add V4L2_CID_MIN_BUFFERS_FOR_* controls media: atomisp: Add check for rgby_data memory allocation failure media: atomisp: remove redundant re-checking of err media: atomisp: Fix spelling errors reported by codespell media: atomisp: Remove License information boilerplate media: atomisp: Fix typos in comment media: atomisp: hmm_bo: Fix spelling errors in hmm_bo.h ...
2 parents b57807c + 72ad4ff commit 9f5a6a1

File tree

1,058 files changed

+9802
-17208
lines changed

Some content is hidden

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

1,058 files changed

+9802
-17208
lines changed

‎.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3737
Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
40+
Alexey Klimov <[email protected]> <[email protected]>
4041
Alexey Makhalov <[email protected]> <[email protected]>
4142
Alex Elder <[email protected]>
4243
Alex Elder <[email protected]> <[email protected]>
@@ -251,6 +252,8 @@ Guru Das Srinagesh <[email protected]> <[email protected]>
251252
Gustavo Padovan <[email protected]>
252253
Gustavo Padovan <[email protected]>
253254
Hanjun Guo <[email protected]> <[email protected]>
255+
Hans Verkuil <[email protected]> <[email protected]>
256+
Hans Verkuil <[email protected]> <[email protected]>
254257
Heiko Carstens <[email protected]> <[email protected]>
255258
Heiko Carstens <[email protected]> <[email protected]>
256259
Heiko Stuebner <[email protected]> <[email protected]>
@@ -269,6 +272,7 @@ Jack Pham <[email protected]> <[email protected]>
269272
Jaegeuk Kim <[email protected]> <[email protected]>
270273
Jaegeuk Kim <[email protected]> <[email protected]>
271274
Jaegeuk Kim <[email protected]> <[email protected]>
275+
Jai Luthra <[email protected]> <[email protected]>
272276
Jakub Kicinski <[email protected]> <[email protected]>
273277
James Bottomley <jejb@mulgrave.(none)>
274278
James Bottomley <[email protected]>

‎Documentation/admin-guide/media/building.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please notice, however, that, if:
1515

1616
you should use the main media development tree ``master`` branch:
1717

18-
https://git.linuxtv.org/media_tree.git/
18+
https://git.linuxtv.org/media.git/
1919

2020
In this case, you may find some useful information at the
2121
`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

‎Documentation/admin-guide/media/omap4_camera.rst

-62
This file was deleted.

‎Documentation/admin-guide/media/raspberrypi-rp1-cfe.dot

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
digraph board {
2+
rankdir=TB
3+
n00000001 [label="{{<port0> 0} | csi2\n/dev/v4l-subdev0 | {<port1> 1 | <port2> 2 | <port3> 3 | <port4> 4}}", shape=Mrecord, style=filled, fillcolor=green]
4+
n00000001:port1 -> n00000011 [style=dashed]
5+
n00000001:port1 -> n00000007:port0
6+
n00000001:port2 -> n00000015
7+
n00000001:port2 -> n00000007:port0 [style=dashed]
8+
n00000001:port3 -> n00000019 [style=dashed]
9+
n00000001:port3 -> n00000007:port0 [style=dashed]
10+
n00000001:port4 -> n0000001d [style=dashed]
11+
n00000001:port4 -> n00000007:port0 [style=dashed]
12+
n00000007 [label="{{<port0> 0 | <port1> 1} | pisp-fe\n/dev/v4l-subdev1 | {<port2> 2 | <port3> 3 | <port4> 4}}", shape=Mrecord, style=filled, fillcolor=green]
13+
n00000007:port2 -> n00000021
14+
n00000007:port3 -> n00000025 [style=dashed]
15+
n00000007:port4 -> n00000029
16+
n0000000d [label="{imx219 6-0010\n/dev/v4l-subdev2 | {<port0> 0}}", shape=Mrecord, style=filled, fillcolor=green]
17+
n0000000d:port0 -> n00000001:port0 [style=bold]
18+
n00000011 [label="rp1-cfe-csi2-ch0\n/dev/video0", shape=box, style=filled, fillcolor=yellow]
19+
n00000015 [label="rp1-cfe-csi2-ch1\n/dev/video1", shape=box, style=filled, fillcolor=yellow]
20+
n00000019 [label="rp1-cfe-csi2-ch2\n/dev/video2", shape=box, style=filled, fillcolor=yellow]
21+
n0000001d [label="rp1-cfe-csi2-ch3\n/dev/video3", shape=box, style=filled, fillcolor=yellow]
22+
n00000021 [label="rp1-cfe-fe-image0\n/dev/video4", shape=box, style=filled, fillcolor=yellow]
23+
n00000025 [label="rp1-cfe-fe-image1\n/dev/video5", shape=box, style=filled, fillcolor=yellow]
24+
n00000029 [label="rp1-cfe-fe-stats\n/dev/video6", shape=box, style=filled, fillcolor=yellow]
25+
n0000002d [label="rp1-cfe-fe-config\n/dev/video7", shape=box, style=filled, fillcolor=yellow]
26+
n0000002d -> n00000007:port1
27+
}

‎Documentation/admin-guide/media/raspberrypi-rp1-cfe.rst

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
============================================
4+
Raspberry Pi PiSP Camera Front End (rp1-cfe)
5+
============================================
6+
7+
The PiSP Camera Front End
8+
=========================
9+
10+
The PiSP Camera Front End (CFE) is a module which combines a CSI-2 receiver with
11+
a simple ISP, called the Front End (FE).
12+
13+
The CFE has four DMA engines and can write frames from four separate streams
14+
received from the CSI-2 to the memory. One of those streams can also be routed
15+
directly to the FE, which can do minimal image processing, write two versions
16+
(e.g. non-scaled and downscaled versions) of the received frames to memory and
17+
provide statistics of the received frames.
18+
19+
The FE registers are documented in the `Raspberry Pi Image Signal Processor
20+
(ISP) Specification document
21+
<https://datasheets.raspberrypi.com/camera/raspberry-pi-image-signal-processor-specification.pdf>`_,
22+
and example code for FE can be found in `libpisp
23+
<https://github.com/raspberrypi/libpisp>`_.
24+
25+
The rp1-cfe driver
26+
==================
27+
28+
The Raspberry Pi PiSP Camera Front End (rp1-cfe) driver is located under
29+
drivers/media/platform/raspberrypi/rp1-cfe. It uses the `V4L2 API` to register
30+
a number of video capture and output devices, the `V4L2 subdev API` to register
31+
subdevices for the CSI-2 received and the FE that connects the video devices in
32+
a single media graph realized using the `Media Controller (MC) API`.
33+
34+
The media topology registered by the `rp1-cfe` driver, in this particular
35+
example connected to an imx219 sensor, is the following one:
36+
37+
.. _rp1-cfe-topology:
38+
39+
.. kernel-figure:: raspberrypi-rp1-cfe.dot
40+
:alt: Diagram of an example media pipeline topology
41+
:align: center
42+
43+
The media graph contains the following video device nodes:
44+
45+
- rp1-cfe-csi2-ch0: capture device for the first CSI-2 stream
46+
- rp1-cfe-csi2-ch1: capture device for the second CSI-2 stream
47+
- rp1-cfe-csi2-ch2: capture device for the third CSI-2 stream
48+
- rp1-cfe-csi2-ch3: capture device for the fourth CSI-2 stream
49+
- rp1-cfe-fe-image0: capture device for the first FE output
50+
- rp1-cfe-fe-image1: capture device for the second FE output
51+
- rp1-cfe-fe-stats: capture device for the FE statistics
52+
- rp1-cfe-fe-config: output device for FE configuration
53+
54+
rp1-cfe-csi2-chX
55+
----------------
56+
57+
The rp1-cfe-csi2-chX capture devices are normal V4L2 capture devices which
58+
can be used to capture video frames or metadata received from the CSI-2.
59+
60+
rp1-cfe-fe-image0, rp1-cfe-fe-image1
61+
------------------------------------
62+
63+
The rp1-cfe-fe-image0 and rp1-cfe-fe-image1 capture devices are used to write
64+
the processed frames to memory.
65+
66+
rp1-cfe-fe-stats
67+
----------------
68+
69+
The format of the FE statistics buffer is defined by
70+
:c:type:`pisp_statistics` C structure and the meaning of each parameter is
71+
described in the `PiSP specification` document.
72+
73+
rp1-cfe-fe-config
74+
-----------------
75+
76+
The format of the FE configuration buffer is defined by
77+
:c:type:`pisp_fe_config` C structure and the meaning of each parameter is
78+
described in the `PiSP specification` document.

‎Documentation/admin-guide/media/saa7134.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Changes / Fixes
6767
Please mail to linux-media AT vger.kernel.org unified diffs against
6868
the linux media git tree:
6969

70-
https://git.linuxtv.org/media_tree.git/
70+
https://git.linuxtv.org/media.git/
7171

7272
This is done by committing a patch at a clone of the git tree and
7373
submitting the patch using ``git send-email``. Don't forget to

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Video4Linux (V4L) driver-specific documentation
2020
ivtv
2121
mgb4
2222
omap3isp
23-
omap4_camera
2423
philips
2524
qcom_camss
2625
raspberrypi-pisp-be
2726
rcar-fdp1
2827
rkisp1
28+
raspberrypi-rp1-cfe
2929
saa7134
3030
si470x
3131
si4713

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

+6
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ properties:
3939
maxItems: 1
4040

4141
adv,force-bt656-4:
42+
deprecated: true
43+
description:
44+
Indicates that the output is a BT.656-4 compatible stream.
45+
type: boolean
46+
47+
adi,force-bt656-4:
4248
description:
4349
Indicates that the output is a BT.656-4 compatible stream.
4450
type: boolean

‎Documentation/devicetree/bindings/media/i2c/hynix,hi846.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ properties:
2828
items:
2929
- description: Reference to the mclk clock.
3030

31-
assigned-clocks:
32-
maxItems: 1
33-
34-
assigned-clock-rates:
35-
maxItems: 1
36-
3731
reset-gpios:
3832
description: Reference to the GPIO connected to the RESETB pin. Active low.
3933
maxItems: 1
@@ -82,8 +76,6 @@ required:
8276
- compatible
8377
- reg
8478
- clocks
85-
- assigned-clocks
86-
- assigned-clock-rates
8779
- vddio-supply
8880
- vdda-supply
8981
- vddd-supply
@@ -105,8 +97,6 @@ examples:
10597
pinctrl-names = "default";
10698
pinctrl-0 = <&pinctrl_csi1>;
10799
clocks = <&clk 0>;
108-
assigned-clocks = <&clk 0>;
109-
assigned-clock-rates = <25000000>;
110100
vdda-supply = <&reg_camera_vdda>;
111101
vddd-supply = <&reg_camera_vddd>;
112102
vddio-supply = <&reg_camera_vddio>;

‎Documentation/devicetree/bindings/media/i2c/maxim,max96712.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ description: |
2525
2626
properties:
2727
compatible:
28-
const: maxim,max96712
28+
items:
29+
- enum:
30+
- maxim,max96712
31+
- maxim,max96724
2932

3033
reg:
3134
description: I2C device address

0 commit comments

Comments
 (0)