Commit 00c6649b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 1f5ffc67 4fbeef21

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com> 
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>

Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>

Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>

Hans Verkuil <hverkuil@kernel.org> <hans.verkuil@cisco.com>

Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>

Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>

Harry Yoo <harry@kernel.org> <harry.yoo@oracle.com>

Documentation/admin-guide/media/mgb4.rst

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ Common FPDL3/GMSL input parameters 


    | 0 - OLDI/JEIDA

    | 1 - SPWG/VESA (default)

    | 2 - ZDML



**link_status** (R):

    Video link status. If the link is locked, chips are properly connected and
@@ -240,6 +241,13 @@ Common FPDL3/GMSL output parameters 
    *Note: This parameter can not be changed while the output v4l2 device is

    open.*



**color_mapping** (RW):

    Mapping of the outgoing bits in the signal to the colour bits of the pixels.



    | 0 - OLDI/JEIDA

    | 1 - SPWG/VESA (default)

    | 2 - ZDML



**frame_rate** (RW):

    Output video signal frame rate limit in frames per second. Due to

    the limited output pixel clock steps, the card can not always generate

Documentation/admin-guide/media/starfive_camss.rst

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. include:: <isonum.txt>



================================

Starfive Camera Subsystem driver

================================



Introduction

------------



This file documents the driver for the Starfive Camera Subsystem found on

Starfive JH7110 SoC. The driver is located under drivers/staging/media/starfive/

camss.



The driver implements V4L2, Media controller and v4l2_subdev interfaces. Camera

sensor using V4L2 subdev interface in the kernel is supported.



The driver has been successfully used on the Gstreamer 1.18.5 with v4l2src

plugin.





Starfive Camera Subsystem hardware

----------------------------------



The Starfive Camera Subsystem hardware consists of::



                    |\         +---------------+      +-----------+

  +----------+      |  \       |               |      |           |

  |          |      |   |      |               |      |           |

  |   MIPI   |----->|   |----->|      ISP      |----->|           |

  |          |      |   |      |               |      |           |

  +----------+      |   |      |               |      |  Memory   |

                    |MUX|      +---------------+      | Interface |

  +----------+      |   |                             |           |

  |          |      |   |---------------------------->|           |

  | Parallel |----->|   |                             |           |

  |          |      |   |                             |           |

  +----------+      |  /                              |           |

                    |/                                +-----------+



- MIPI: The MIPI interface, receiving data from a MIPI CSI-2 camera sensor.



- Parallel: The parallel interface,  receiving data from a parallel sensor.



- ISP: The ISP, processing raw Bayer data from an image sensor and producing

  YUV frames.





Topology

--------



The media controller pipeline graph is as follows:



.. _starfive_camss_graph:



.. kernel-figure:: starfive_camss_graph.dot

    :alt:   starfive_camss_graph.dot

    :align: center



The driver has 2 video devices:



- capture_raw: The capture device, capturing image data directly from a sensor.

- capture_yuv: The capture device, capturing YUV frame data processed by the

  ISP module



The driver has 3 subdevices:



- stf_isp: is responsible for all the isp operations, outputs YUV frames.

- cdns_csi2rx: a CSI-2 bridge supporting up to 4 CSI lanes in input, and 4

  different pixel streams in output.

- imx219: an image sensor, image data is sent through MIPI CSI-2.

Documentation/admin-guide/media/starfive_camss_graph.dot

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
digraph board {

	rankdir=TB

	n00000001 [label="{{<port0> 0} | stf_isp\n/dev/v4l-subdev0 | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]

	n00000001:port1 -> n00000008 [style=dashed]

	n00000004 [label="capture_raw\n/dev/video0", shape=box, style=filled, fillcolor=yellow]

	n00000008 [label="capture_yuv\n/dev/video1", shape=box, style=filled, fillcolor=yellow]

	n0000000e [label="{{<port0> 0} | cdns_csi2rx.19800000.csi-bridge\n | {<port1> 1 | <port2> 2 | <port3> 3 | <port4> 4}}", shape=Mrecord, style=filled, fillcolor=green]

	n0000000e:port1 -> n00000001:port0 [style=dashed]

	n0000000e:port1 -> n00000004 [style=dashed]

	n00000018 [label="{{} | imx219 6-0010\n/dev/v4l-subdev1 | {<port0> 0}}", shape=Mrecord, style=filled, fillcolor=green]

	n00000018:port0 -> n0000000e:port0 [style=bold]

}

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ Video4Linux (V4L) driver-specific documentation 
	si470x

	si4713

	si476x

	starfive_camss

	vimc

	visl

	vivid