Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0880dcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
  [media] Add missing include guard to header file
  [media] Inlined functions should be static
  [media] Remove invalid parameter description
  [media] cpia2: fix warning about invalid trigraph sequence
  [media] s5p-csis: Add missing dependency on PLAT_S5P
  [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
  [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
  [media] uvcvideo: Connect video devices to media entities
  [media] uvcvideo: Register subdevices for each entity
  [media] uvcvideo: Register a v4l2_device
  [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
  [media] Documentation/DocBook: Rename media fops xml files
  [media] Media DocBook: fix validation errors
  [media] wl12xx: g_volatile_ctrl fix: wrong field set
  [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
  [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
  [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
parents f7fc06e3 616a4b83

Documentation/DocBook/dvb/dvbproperty.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -141,13 +141,15 @@ struct dtv_properties { 
 </row></tbody></tgroup></informaltable>

 </row></tbody></tgroup></informaltable>

</section>

</section>





<section>

	<title>Property types</title>

<para>

<para>

On <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>/<link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,

On <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>/<link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,

the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to

the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to

get/set up to 64 properties. The actual meaning of each property is described on the next sections.

get/set up to 64 properties. The actual meaning of each property is described on the next sections.

</para>

</para>





<para>The Available frontend property types are:</para>

<para>The available frontend property types are:</para>

<programlisting>

<programlisting>

#define DTV_UNDEFINED		0

#define DTV_UNDEFINED		0

#define DTV_TUNE		1

#define DTV_TUNE		1
@@ -193,6 +195,7 @@ get/set up to 64 properties. The actual meaning of each property is described on 
#define DTV_ISDBT_LAYER_ENABLED	41

#define DTV_ISDBT_LAYER_ENABLED	41

#define DTV_ISDBS_TS_ID		42

#define DTV_ISDBS_TS_ID		42

</programlisting>

</programlisting>

</section>





<section id="fe_property_common">

<section id="fe_property_common">

	<title>Parameters that are common to all Digital TV standards</title>

	<title>Parameters that are common to all Digital TV standards</title>

Documentation/DocBook/media-entities.tmpl

+4 −3
Original line number Original line Diff line number Diff line
@@ -293,6 +293,7 @@ 
<!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml">

<!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml">

<!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml">

<!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml">

<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">

<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">

<!ENTITY sub-srggb12 SYSTEM "v4l/pixfmt-srggb12.xml">

<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">

<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">

<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">

<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">

<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">

<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
@@ -373,9 +374,9 @@ 
<!ENTITY sub-media-indices SYSTEM "media-indices.tmpl">

<!ENTITY sub-media-indices SYSTEM "media-indices.tmpl">





<!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml">

<!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml">

<!ENTITY sub-media-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-func-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-func-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-func-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-ioc-device-info SYSTEM "v4l/media-ioc-device-info.xml">

<!ENTITY sub-media-ioc-device-info SYSTEM "v4l/media-ioc-device-info.xml">

<!ENTITY sub-media-ioc-enum-entities SYSTEM "v4l/media-ioc-enum-entities.xml">

<!ENTITY sub-media-ioc-enum-entities SYSTEM "v4l/media-ioc-enum-entities.xml">

<!ENTITY sub-media-ioc-enum-links SYSTEM "v4l/media-ioc-enum-links.xml">

<!ENTITY sub-media-ioc-enum-links SYSTEM "v4l/media-ioc-enum-links.xml">

Documentation/DocBook/v4l/media-controller.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,9 @@ 
<appendix id="media-user-func">

<appendix id="media-user-func">

  <title>Function Reference</title>

  <title>Function Reference</title>

  <!-- Keep this alphabetically sorted. -->

  <!-- Keep this alphabetically sorted. -->

  &sub-media-open;

  &sub-media-func-open;

  &sub-media-close;

  &sub-media-func-close;

  &sub-media-ioctl;

  &sub-media-func-ioctl;

  <!-- All ioctls go here. -->

  <!-- All ioctls go here. -->

  &sub-media-ioc-device-info;

  &sub-media-ioc-device-info;

  &sub-media-ioc-enum-entities;

  &sub-media-ioc-enum-entities;

Documentation/DocBook/v4l/pixfmt.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -673,6 +673,7 @@ access the palette, this must be done with ioctls of the Linux framebuffer API.< 
    &sub-srggb8;

    &sub-srggb8;

    &sub-sbggr16;

    &sub-sbggr16;

    &sub-srggb10;

    &sub-srggb10;

    &sub-srggb12;

  </section>

  </section>





  <section id="yuv-formats">

  <section id="yuv-formats">

Documentation/DocBook/v4l/subdev-formats.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -2531,14 +2531,14 @@ 
	<constant>_JPEG</constant> prefix the format code is made of

	<constant>_JPEG</constant> prefix the format code is made of

	the following information.

	the following information.

	<itemizedlist>

	<itemizedlist>

	  <listitem>The number of bus samples per entropy encoded byte.</listitem>

	  <listitem><para>The number of bus samples per entropy encoded byte.</para></listitem>

	  <listitem>The bus width.</listitem>

	  <listitem><para>The bus width.</para></listitem>

	</itemizedlist>

	</itemizedlist>

      </para>





      <para>For instance, for a JPEG baseline process and an 8-bit bus width

      <para>For instance, for a JPEG baseline process and an 8-bit bus width

        the format will be named <constant>V4L2_MBUS_FMT_JPEG_1X8</constant>.

        the format will be named <constant>V4L2_MBUS_FMT_JPEG_1X8</constant>.

      </para>

      </para>

      </para>





      <para>The following table lists existing JPEG compressed formats.</para>

      <para>The following table lists existing JPEG compressed formats.</para>