From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Fabio Estevam <festevam@gmail.com>
Cc: hverkuil@xs4all.nl, sakari.ailus@iki.fi, rmfrfs@gmail.com,
linux-media@vger.kernel.org, slongerbeam@gmail.com,
p.zabel@pengutronix.de
Subject: Re: [PATCH] media: imx7.rst: Fix the references to the CSI multiplexer
Date: Thu, 25 Jul 2019 07:41:23 -0300 [thread overview]
Message-ID: <20190725074123.2864b148@coco.lan> (raw)
In-Reply-To: <20190629121623.18069-1-festevam@gmail.com>
Em Sat, 29 Jun 2019 09:16:23 -0300
Fabio Estevam <festevam@gmail.com> escreveu:
> 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:
>
> # media-ctl -l "'imx7-mipi-csis.0':1 -> 'csi_mux':1[1]"
> 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: fa88fbdafb4a ("media: imx7.rst: add documentation for i.MX7 media driver")
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> Documentation/media/v4l-drivers/imx7.rst | 127 +++++++++++------------
> 1 file changed, 63 insertions(+), 64 deletions(-)
>
> diff --git a/Documentation/media/v4l-drivers/imx7.rst b/Documentation/media/v4l-drivers/imx7.rst
> index fe411f65c01c..ab9e17d111bf 100644
> --- a/Documentation/media/v4l-drivers/imx7.rst
> +++ b/Documentation/media/v4l-drivers/imx7.rst
> @@ -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
> 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
> @@ -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
> 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
> routed to a capture device node.
>
> @@ -81,14 +81,14 @@ an output of 800x600, and BGGR 10 bit bayer format:
>
> # Setup links
> 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 "'csi_mux':2 -> 'csi':0[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':1 -> 'csi capture':0[1]"
>
> # Configure pads for pipeline
> 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':2 [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 "'imx7-mipi-csis.0':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
>
> - root@imx7s-warp:~# media-ctl -p
> - Media controller API version 4.17.0
> -
> - Media device information
> - ------------------------
> - driver imx-media
> - model imx-media
> - serial
> - bus info
> - hw revision 0x0
> - driver version 4.17.0
> -
> - Device topology
> - - entity 1: csi (2 pads, 2 links)
> - type V4L2 subdev subtype Unknown flags 0
> - device node name /dev/v4l-subdev0
> - pad0: Sink
> - [fmt:SBGGR10_1X10/800x600 field:none]
> - <- "csi_mux":2 [ENABLED]
> - pad1: Source
> - [fmt:SBGGR10_1X10/800x600 field:none]
> - -> "csi capture":0 [ENABLED]
> -
> - - entity 4: csi capture (1 pad, 1 link)
> - type Node subtype V4L flags 0
> - device node name /dev/video0
> - pad0: Sink
> - <- "csi":1 [ENABLED]
> -
> - - entity 10: csi_mux (3 pads, 2 links)
> - type V4L2 subdev subtype Unknown flags 0
> - device node name /dev/v4l-subdev1
> - pad0: Sink
> - [fmt:unknown/0x0]
> - pad1: Sink
> - [fmt:unknown/800x600 field:none]
> - <- "imx7-mipi-csis.0":1 [ENABLED]
> - pad2: Source
> - [fmt:unknown/800x600 field:none]
> - -> "csi":0 [ENABLED]
> -
> - - entity 14: imx7-mipi-csis.0 (2 pads, 2 links)
> - type V4L2 subdev subtype Unknown flags 0
> - device node name /dev/v4l-subdev2
> - pad0: Sink
> - [fmt:SBGGR10_1X10/800x600 field:none]
> - <- "ov2680 1-0036":0 [ENABLED]
> - pad1: Source
> - [fmt:SBGGR10_1X10/800x600 field:none]
> - -> "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]
> -
> +# media-ctl -p
> +Media controller API version 5.2.0
> +
> +Media device information
> +------------------------
> +driver imx7-csi
> +model imx-media
> +serial
> +bus info
> +hw revision 0x0
> +driver version 5.2.0
> +
> +Device topology
> +- entity 1: csi (2 pads, 2 links)
> + type V4L2 subdev subtype Unknown flags 0
> + device node name /dev/v4l-subdev0
> + pad0: Sink
> + [fmt:SBGGR10_1X10/800x600 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
> + <- "csi-mux":2 [ENABLED]
> + pad1: Source
> + [fmt:SBGGR10_1X10/800x600 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]
> + -> "csi capture":0 [ENABLED]
> +
> +- entity 4: csi capture (1 pad, 1 link)
> + type Node subtype V4L flags 0
> + device node name /dev/video0
> + pad0: Sink
> + <- "csi":1 [ENABLED]
> +
> +- entity 10: csi-mux (3 pads, 2 links)
> + type V4L2 subdev subtype Unknown flags 0
> + device node name /dev/v4l-subdev1
> + pad0: Sink
> + [fmt:Y8_1X8/1x1 field:none]
> + pad1: Sink
> + [fmt:SBGGR10_1X10/800x600 field:none]
> + <- "imx7-mipi-csis.0":1 [ENABLED]
> + pad2: Source
> + [fmt:SBGGR10_1X10/800x600 field:none]
> + -> "csi":0 [ENABLED]
> +
> +- entity 14: imx7-mipi-csis.0 (2 pads, 2 links)
> + type V4L2 subdev subtype Unknown flags 0
> + device node name /dev/v4l-subdev2
> + pad0: Sink
> + [fmt:SBGGR10_1X10/800x600 field:none]
> + <- "ov2680 1-0036":0 [ENABLED]
> + pad1: Source
> + [fmt:SBGGR10_1X10/800x600 field:none]
> + -> "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@1/30 field:none colorspace:srgb]
> + -> "imx7-mipi-csis.0":0 [ENABLED]
Did you check the "make htmldocs" output after this change?
This code-block is broken, as it starts from column 1.
Please add a tab (or at least 2 spaces) before each line, in order
to make Sphinx process this code block.
Thanks,
Mauro
next prev parent reply other threads:[~2019-07-25 10:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-29 12:16 [PATCH] media: imx7.rst: Fix the references to the CSI multiplexer Fabio Estevam
2019-07-01 9:23 ` Rui Miguel Silva
2019-07-25 10:41 ` Mauro Carvalho Chehab [this message]
2019-07-25 13:02 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190725074123.2864b148@coco.lan \
--to=mchehab@kernel.org \
--cc=festevam@gmail.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=rmfrfs@gmail.com \
--cc=sakari.ailus@iki.fi \
--cc=slongerbeam@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.