redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

media: imx7.rst: Fix the references to the CSI multiplexer 

In imx7s.dtsi the node name for the CSI multiplexer is "csi-mux", not
"csi_mux", so fix all the references in the document.

This fixes the following error when the instructions are followed:

Unable to parse link: Invalid argument (22)

While at it, provide the "media-ctl -p" output from 5.2 kernel
version, so that users can see a more updated output.

Fixes: fa88fbdafb ("media: imx7.rst: add documentation for i.MX7 media driver")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
alistair/sunxi64-5.4-dsi
Fabio Estevam 2019-08-01 14:56:11 -03:00 committed by Mauro Carvalho Chehab
parent 00ab9c1a62
commit 8fb294ca20
1 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Documentation/media/v4l-drivers/imx7.rst
View File

@ -41,7 +41,7 @@ data from MIPI CSI-2 camera sensor. It has one source pad, corresponding to the
virtual channel 0. This module is compliant to previous version of Samsung virtual channel 0. This module is compliant to previous version of Samsung
D-phy, and supports two D-PHY Rx Data lanes. D-phy, and supports two D-PHY Rx Data lanes.
csi_mux csi-mux
------- -------
This is the video multiplexer. It has two sink pads to select from either camera This is the video multiplexer. It has two sink pads to select from either camera
@ -56,7 +56,7 @@ can interface directly with Parallel and MIPI CSI-2 buses. It has 256 x 64 FIFO
to store received image pixel data and embedded DMA controllers to transfer data to store received image pixel data and embedded DMA controllers to transfer data
from the FIFO through AHB bus. from the FIFO through AHB bus.
This entity has one sink pad that receives from the csi_mux entity and a single This entity has one sink pad that receives from the csi-mux entity and a single
source pad that routes video frames directly to memory buffers. This pad is source pad that routes video frames directly to memory buffers. This pad is
routed to a capture device node. routed to a capture device node.
@ -81,14 +81,14 @@ an output of 800x600, and BGGR 10 bit bayer format:
# Setup links # Setup links
media-ctl -l "'ov2680 1-0036':0 -> 'imx7-mipi-csis.0':0[1]" media-ctl -l "'ov2680 1-0036':0 -> 'imx7-mipi-csis.0':0[1]"
media-ctl -l "'imx7-mipi-csis.0':1 -> 'csi_mux':1[1]" media-ctl -l "'imx7-mipi-csis.0':1 -> 'csi-mux':1[1]"
media-ctl -l "'csi_mux':2 -> 'csi':0[1]" media-ctl -l "'csi-mux':2 -> 'csi':0[1]"
media-ctl -l "'csi':1 -> 'csi capture':0[1]" media-ctl -l "'csi':1 -> 'csi capture':0[1]"
# Configure pads for pipeline # Configure pads for pipeline
media-ctl -V "'ov2680 1-0036':0 [fmt:SBGGR10_1X10/800x600 field:none]" media-ctl -V "'ov2680 1-0036':0 [fmt:SBGGR10_1X10/800x600 field:none]"
media-ctl -V "'csi_mux':1 [fmt:SBGGR10_1X10/800x600 field:none]" media-ctl -V "'csi-mux':1 [fmt:SBGGR10_1X10/800x600 field:none]"
media-ctl -V "'csi_mux':2 [fmt:SBGGR10_1X10/800x600 field:none]" media-ctl -V "'csi-mux':2 [fmt:SBGGR10_1X10/800x600 field:none]"
media-ctl -V "'imx7-mipi-csis.0':0 [fmt:SBGGR10_1X10/800x600 field:none]" media-ctl -V "'imx7-mipi-csis.0':0 [fmt:SBGGR10_1X10/800x600 field:none]"
media-ctl -V "'csi':0 [fmt:SBGGR10_1X10/800x600 field:none]" media-ctl -V "'csi':0 [fmt:SBGGR10_1X10/800x600 field:none]"
@ -97,64 +97,63 @@ the resolutions supported by the sensor.
.. code-block:: none .. code-block:: none
root@imx7s-warp:~# media-ctl -p # media-ctl -p
Media controller API version 4.17.0 Media controller API version 5.2.0
Media device information Media device information
------------------------ ------------------------
driver imx-media driver imx7-csi
model imx-media model imx-media
serial serial
bus info bus info
hw revision 0x0 hw revision 0x0
driver version 4.17.0 driver version 5.2.0
Device topology Device topology
- entity 1: csi (2 pads, 2 links) - entity 1: csi (2 pads, 2 links)
type V4L2 subdev subtype Unknown flags 0 type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev0 device node name /dev/v4l-subdev0
pad0: Sink pad0: Sink
[fmt:SBGGR10_1X10/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
<- "csi_mux":2 [ENABLED] <- "csi-mux":2 [ENABLED]
pad1: Source pad1: Source
[fmt:SBGGR10_1X10/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
-> "csi capture":0 [ENABLED] -> "csi capture":0 [ENABLED]
- entity 4: csi capture (1 pad, 1 link) - entity 4: csi capture (1 pad, 1 link)
type Node subtype V4L flags 0 type Node subtype V4L flags 0
device node name /dev/video0 device node name /dev/video0
pad0: Sink pad0: Sink
<- "csi":1 [ENABLED] <- "csi":1 [ENABLED]
- entity 10: csi_mux (3 pads, 2 links) - entity 10: csi-mux (3 pads, 2 links)
type V4L2 subdev subtype Unknown flags 0 type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev1 device node name /dev/v4l-subdev1
pad0: Sink pad0: Sink
[fmt:unknown/0x0] [fmt:Y8_1X8/1x1 field:none]
pad1: Sink pad1: Sink
[fmt:unknown/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none]
<- "imx7-mipi-csis.0":1 [ENABLED] <- "imx7-mipi-csis.0":1 [ENABLED]
pad2: Source pad2: Source
[fmt:unknown/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none]
-> "csi":0 [ENABLED] -> "csi":0 [ENABLED]
- entity 14: imx7-mipi-csis.0 (2 pads, 2 links) - entity 14: imx7-mipi-csis.0 (2 pads, 2 links)
type V4L2 subdev subtype Unknown flags 0 type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev2 device node name /dev/v4l-subdev2
pad0: Sink pad0: Sink
[fmt:SBGGR10_1X10/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none]
<- "ov2680 1-0036":0 [ENABLED] <- "ov2680 1-0036":0 [ENABLED]
pad1: Source pad1: Source
[fmt:SBGGR10_1X10/800x600 field:none] [fmt:SBGGR10_1X10/800x600 field:none]
-> "csi_mux":1 [ENABLED] -> "csi-mux":1 [ENABLED]
- entity 17: ov2680 1-0036 (1 pad, 1 link)
type V4L2 subdev subtype Sensor flags 0
device node name /dev/v4l-subdev3
pad0: Source
[fmt:SBGGR10_1X10/800x600 field:none]
-> "imx7-mipi-csis.0":0 [ENABLED]
- entity 17: ov2680 1-0036 (1 pad, 1 link)
type V4L2 subdev subtype Sensor flags 0
device node name /dev/v4l-subdev3
pad0: Source
[fmt:SBGGR10_1X10/800x600@1/30 field:none colorspace:srgb]
-> "imx7-mipi-csis.0":0 [ENABLED]
References References
---------- ----------