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

Commit 0ec28c37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull second set of media updates from Mauro Carvalho Chehab:

 - Move drivers for really old legacy hardware to staging.  Those are
   using obsolete media kAPIs and are for hardware that nobody uses for
   years.  Simply not worth porting them to the new kAPIs.  Of course,
   if anyone pops up to fix, we can move them back from there

 - While not too late, do some API fixups at the new colorspace API,
   added for v3.19

 - Some improvements for rcar_vin driver

 - Some fixups at cx88 and vivid drivers

 - Some Documentation fixups

* tag 'media/v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] bq/c-qcam, w9966, pms: move to staging in preparation for removal
  [media] tlg2300: move to staging in preparation for removal
  [media] vino/saa7191: move to staging in preparation for removal
  [media] MAINTAINERS: vivi -> vivid
  [media] cx88: remove leftover start_video_dma() call
  [media] cx88: add missing alloc_ctx support
  [media] v4l2-ioctl: WARN_ON if querycap didn't fill device_caps
  [media] vivid: fix CROP_BOUNDS typo for video output
  [media] DocBook media: update version number and document changes
  [media] vivid.txt: document new controls
  [media] DocBook media: add missing ycbcr_enc and quantization fields
  [media] v4l2-mediabus.h: use two __u16 instead of two __u32
  [media] rcar_vin: Fix interrupt enable in progressive
  [media] rcar_vin: Enable VSYNC field toggle mode
  [media] rcar_vin: Add scaling support
  [media] rcar_vin: Add DT support for r8a7793 and r8a7794 SoCs
  [media] rcar_vin: Add YUYV capture format support
parents 4c929fee 427ae153

Documentation/DocBook/media/v4l/compat.xml

+12 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,18 @@ fields changed from _s32 to _u32. 
      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.19</title>

      <orderedlist>

	<listitem>

	  <para>Rewrote Colorspace chapter, added new &v4l2-ycbcr-encoding;

and &v4l2-quantization; fields to &v4l2-pix-format;, &v4l2-pix-format-mplane;

and &v4l2-mbus-framefmt;.

	  </para>

	</listitem>

      </orderedlist>

    </section>



    <section id="other">

      <title>Relation of V4L2 to other Linux multimedia APIs</title>

Documentation/DocBook/media/v4l/pixfmt.xml

+34 −2
Original line number Diff line number Diff line
@@ -141,6 +141,22 @@ applicable values.</para></entry> 
	  <entry>Flags set by the application or driver, see <xref

linkend="format-flags" />.</entry>

	</row>

	<row>

	  <entry>&v4l2-ycbcr-encoding;</entry>

	  <entry><structfield>ycbcr_enc</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

	<row>

	  <entry>&v4l2-quantization;</entry>

	  <entry><structfield>quantization</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

      </tbody>

    </tgroup>

  </table>
@@ -231,10 +247,26 @@ codes can be used.</entry> 
	  <entry><structfield>flags</structfield></entry>

	  <entry>Flags set by the application or driver, see <xref

linkend="format-flags" />.</entry>

	</row>

	<row>

	  <entry>&v4l2-ycbcr-encoding;</entry>

	  <entry><structfield>ycbcr_enc</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

	<row>

	  <entry>&v4l2-quantization;</entry>

	  <entry><structfield>quantization</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

        <row>

          <entry>__u8</entry>

          <entry><structfield>reserved[10]</structfield></entry>

          <entry><structfield>reserved[8]</structfield></entry>

          <entry>Reserved for future extensions. Should be zeroed by the

           application.</entry>

        </row>

Documentation/DocBook/media/v4l/subdev-formats.xml

+17 −1
Original line number Diff line number Diff line
@@ -33,9 +33,25 @@ 
	  <entry>Image colorspace, from &v4l2-colorspace;. See

	  <xref linkend="colorspaces" /> for details.</entry>

	</row>

	<row>

	  <entry>&v4l2-ycbcr-encoding;</entry>

	  <entry><structfield>ycbcr_enc</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

	<row>

	  <entry>&v4l2-quantization;</entry>

	  <entry><structfield>quantization</structfield></entry>

	  <entry>This information supplements the

<structfield>colorspace</structfield> and must be set by the driver for

capture streams and by the application for output streams,

see <xref linkend="colorspaces" />.</entry>

	</row>

	<row>

	  <entry>__u32</entry>

	  <entry><structfield>reserved</structfield>[7]</entry>

	  <entry><structfield>reserved</structfield>[6]</entry>

	  <entry>Reserved for future extensions. Applications and drivers must

	  set the array to zero.</entry>

	</row>

Documentation/DocBook/media/v4l/v4l2.xml

+10 −1
Original line number Diff line number Diff line
@@ -151,6 +151,15 @@ structs, ioctls) must be noted in more detail in the history chapter 
(compat.xml), along with the possible impact on existing drivers and

applications. -->



      <revision>

	<revnumber>3.19</revnumber>

	<date>2014-12-05</date>

	<authorinitials>hv</authorinitials>

	<revremark>Rewrote Colorspace chapter, added new &v4l2-ycbcr-encoding; and &v4l2-quantization; fields

to &v4l2-pix-format;, &v4l2-pix-format-mplane; and &v4l2-mbus-framefmt;.

	</revremark>

      </revision>



      <revision>

	<revnumber>3.17</revnumber>

	<date>2014-08-04</date>
@@ -539,7 +548,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 3.17</subtitle>

 <subtitle>Revision 3.19</subtitle>



  <chapter id="common">

    &sub-common;

Documentation/devicetree/bindings/media/rcar_vin.txt

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input 
channel which can be either RGB, YUYV or BT656.



 - compatible: Must be one of the following

   - "renesas,vin-r8a7794" for the R8A7794 device

   - "renesas,vin-r8a7793" for the R8A7793 device

   - "renesas,vin-r8a7791" for the R8A7791 device

   - "renesas,vin-r8a7790" for the R8A7790 device

   - "renesas,vin-r8a7779" for the R8A7779 device