summaryrefslogtreecommitdiffstats
path: root/Documentation/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 21:55:23 +0100
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 21:55:23 +0100
commit3fecc49e0dd82cdec8ac18ff53c7a4d4baedb508 (patch)
treedb13187fd19b08a21401ef0173d5a2d518dae0af /Documentation/media
parentmedia: imx7.rst: add documentation for i.MX7 media driver (diff)
downloadlinux-3fecc49e0dd82cdec8ac18ff53c7a4d4baedb508.tar.xz
linux-3fecc49e0dd82cdec8ac18ff53c7a4d4baedb508.zip
media: imx7.rst: Fix ReST syntax
Sphinx didn't like the code-blocks on this file: Documentation/media/v4l-drivers/imx7.rst:19: WARNING: Inline substitution_reference start-string without end-string. Documentation/media/v4l-drivers/imx7.rst:20: WARNING: Block quote ends without a blank line; unexpected unindent. Documentation/media/v4l-drivers/imx7.rst:27: WARNING: Inline substitution_reference start-string without end-string. Documentation/media/v4l-drivers/imx7.rst:79: WARNING: Error in "code-block" directive: maximum 1 argument(s) allowed, 26 supplied. .. code-block:: none # Setup links <snip/> media-ctl -V "'csi':0 [fmt:SBGGR10_1X10/800x600 field:none]" Documentation/media/v4l-drivers/imx7.rst:96: WARNING: Error in "code-block" directive: maximum 1 argument(s) allowed, 9 supplied. .. code-block:: none <snip/>. -> "imx7-mipi-csis.0":0 [ENABLED] Fix them, in order to match the expected syntax for code blocks. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/v4l-drivers/imx7.rst9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/media/v4l-drivers/imx7.rst b/Documentation/media/v4l-drivers/imx7.rst
index 804d900da535..fe411f65c01c 100644
--- a/Documentation/media/v4l-drivers/imx7.rst
+++ b/Documentation/media/v4l-drivers/imx7.rst
@@ -15,9 +15,10 @@ For image capture the i.MX7 has three units:
- Video Multiplexer
- MIPI CSI-2 Receiver
-::
- |\
- MIPI Camera Input ---> MIPI CSI-2 --- > | \
+.. code-block:: none
+
+ MIPI Camera Input ---> MIPI CSI-2 --- > |\
+ | \
| \
| M |
| U | ------> CSI ---> Capture
@@ -77,6 +78,7 @@ CSI-2 receiver. The following example configures a video capture pipeline with
an output of 800x600, and BGGR 10 bit bayer format:
.. code-block:: none
+
# 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]"
@@ -94,6 +96,7 @@ After this streaming can start. The v4l2-ctl tool can be used to select any of
the resolutions supported by the sensor.
.. code-block:: none
+
root@imx7s-warp:~# media-ctl -p
Media controller API version 4.17.0