summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-17 21:32:50 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-18 03:41:13 +0200
commit8f6174a07e3ef69d51776062d23f4627751cb3a5 (patch)
tree316d5c39479cd5e3e675f15a79cdf1bce501a073
parent[media] doc-rst: convert fourcc to rst format (diff)
downloadlinux-8f6174a07e3ef69d51776062d23f4627751cb3a5.tar.xz
linux-8f6174a07e3ef69d51776062d23f4627751cb3a5.zip
[media] doc-rst: convert cafe_ccic file to rst format
This file is almost ok, but it needs chapter/sections and a code-block. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--Documentation/media/v4l-drivers/cafe_ccic.rst24
-rw-r--r--Documentation/media/v4l-drivers/index.rst1
2 files changed, 16 insertions, 9 deletions
diff --git a/Documentation/media/v4l-drivers/cafe_ccic.rst b/Documentation/media/v4l-drivers/cafe_ccic.rst
index 88821022a5de..b98eb3b7cb4a 100644
--- a/Documentation/media/v4l-drivers/cafe_ccic.rst
+++ b/Documentation/media/v4l-drivers/cafe_ccic.rst
@@ -1,3 +1,11 @@
+The cafe_ccic driver
+====================
+
+Author: Jonathan Corbet <corbet@lwn.net>
+
+Introdution
+-----------
+
"cafe_ccic" is a driver for the Marvell 88ALP01 "cafe" CMOS camera
controller. This is the controller found in first-generation OLPC systems,
and this driver was written with support from the OLPC project.
@@ -10,11 +18,16 @@ sensor is known to work with this controller at this time.
To try it out: either of these commands will work:
- mplayer tv:// -tv driver=v4l2:width=640:height=480 -nosound
- mplayer tv:// -tv driver=v4l2:width=640:height=480:outfmt=bgr16 -nosound
+.. code-block:: none
+
+ $ mplayer tv:// -tv driver=v4l2:width=640:height=480 -nosound
+ $ mplayer tv:// -tv driver=v4l2:width=640:height=480:outfmt=bgr16 -nosound
The "xawtv" utility also works; gqcam does not, for unknown reasons.
+Load time options
+-----------------
+
There are a few load-time options, most of which can be changed after
loading via sysfs as well:
@@ -45,10 +58,3 @@ loading via sysfs as well:
- flip: If this boolean parameter is set, the sensor will be instructed to
invert the video image. Whether it makes sense is determined by how
your particular camera is mounted.
-
-Work is ongoing with this driver, stay tuned.
-
-jon
-
-Jonathan Corbet
-corbet@lwn.net
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index 6391f1622e26..72a96206fcf8 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -20,3 +20,4 @@ License".
fourcc
cardlist
+ cafe_ccic