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

Commit 19c5abcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:
 - added support for Intersil/Techwell TW686x-based video capture cards
 - v4l PCI skeleton driver moved to samples directory
 - Documentation cleanups and improvements
 - RC: reduced the memory footprint for IR raw events
 - tpg: Export the tpg code from vivid as a module
 - adv7180: Add device tree binding documentation
 - lots of driver improvements and fixes

* tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (173 commits)
  [media] exynos-gsc: avoid build warning without CONFIG_OF
  [media] samples: v4l: from Documentation to samples directory
  [media] dib0700: add USB ID for another STK8096-PVR ref design based card
  [media] tvp5150: propagate I2C write error in .s_register callback
  [media] tvp5150: return I2C write operation failure to callers
  [media] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner
  [media] em28xx: add missing USB IDs
  [media] update cx23885 and em28xx cardlists
  [media] media: au0828 fix au0828_v4l2_device_register() to not unlock and free
  [media] c8sectpfe: Rework firmware loading mechanism
  [media] c8sectpfe: Demote print to dev_dbg
  [media] c8sectpfe: Fix broken circular buffer wp management
  [media] media-device: Simplify compat32 logic
  [media] media: i2c: ths7303: remove redundant assignment on bt
  [media] dvb-usb: hide unused functions
  [media] xilinx-vipp: remove unnecessary of_node_put
  [media] drivers/media/media-devnode: clear private_data before put_device()
  [media] drivers/media/media-device: move debug log before _devnode_unregister()
  [media] drivers/media/rc: postpone kfree(rc_dev)
  [media] media/dvb-core: forward media_create_pad_links() return value
  ...
parents 675e0655 aff093d4

Documentation/DocBook/device-drivers.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ X!Isound/sound_firmware.c 
!Iinclude/media/v4l2-mediabus.h

!Iinclude/media/v4l2-mem2mem.h

!Iinclude/media/v4l2-of.h

!Iinclude/media/v4l2-rect.h

!Iinclude/media/v4l2-subdev.h

!Iinclude/media/videobuf2-core.h

!Iinclude/media/videobuf2-v4l2.h

Documentation/DocBook/media/dvb/net.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    that are present on the transport stream. This is done through

    <constant>/dev/dvb/adapter?/net?</constant> device node.

    The data will be available via virtual <constant>dvb?_?</constant>

    network interfaces, and will be controled/routed via the standard

    network interfaces, and will be controlled/routed via the standard

    ip tools (like ip, route, netstat, ifconfig, etc).</para>

<para> Data types and and ioctl definitions are defined via

    <constant>linux/dvb/net.h</constant> header.</para>

Documentation/DocBook/media/v4l/compat.xml

+0 −38
Original line number Diff line number Diff line
@@ -2685,10 +2685,6 @@ hardware may support both.</para> 
and may change in the future.</para>



      <itemizedlist>

        <listitem>

	  <para>Video Output Overlay (OSD) Interface, <xref

	    linkend="osd" />.</para>

        </listitem>

        <listitem>

	  <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER;

ioctls.</para>
@@ -2696,40 +2692,6 @@ ioctls.</para> 
        <listitem>

	  <para>&VIDIOC-DBG-G-CHIP-INFO; ioctl.</para>

        </listitem>

        <listitem>

	  <para>&VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and

	  &VIDIOC-DV-TIMINGS-CAP; ioctls.</para>

        </listitem>

        <listitem>

	  <para>Flash API. <xref linkend="flash-controls" /></para>

        </listitem>

        <listitem>

	  <para>&VIDIOC-CREATE-BUFS; and &VIDIOC-PREPARE-BUF; ioctls.</para>

        </listitem>

        <listitem>

	  <para>Selection API. <xref linkend="selection-api" /></para>

        </listitem>

        <listitem>

	  <para>Sub-device selection API: &VIDIOC-SUBDEV-G-SELECTION;

	  and &VIDIOC-SUBDEV-S-SELECTION; ioctls.</para>

        </listitem>

        <listitem>

	  <para>Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl.</para>

        </listitem>

        <listitem>

	  <para>Vendor and device specific media bus pixel formats.

	    <xref linkend="v4l2-mbus-vendor-spec-fmts" />.</para>

        </listitem>

        <listitem>

	  <para>Importing DMABUF file descriptors as a new IO method described

	  in <xref linkend="dmabuf" />.</para>

        </listitem>

        <listitem>

	  <para>Exporting DMABUF files using &VIDIOC-EXPBUF; ioctl.</para>

        </listitem>

        <listitem>

	  <para>Software Defined Radio (SDR) Interface, <xref linkend="sdr" />.</para>

        </listitem>

      </itemizedlist>

    </section>

Documentation/DocBook/media/v4l/controls.xml

+0 −31
Original line number Diff line number Diff line
@@ -4272,13 +4272,6 @@ manually or automatically if set to zero. Unit, range and step are driver-specif 
    <section id="flash-controls">

      <title>Flash Control Reference</title>



      <note>

	<title>Experimental</title>



	<para>This is an <link linkend="experimental">experimental</link>

interface and may change in the future.</para>

      </note>



      <para>

	The V4L2 flash controls are intended to provide generic access

	to flash controller devices. Flash controller devices are
@@ -4743,14 +4736,6 @@ interface and may change in the future.</para> 
    <section id="image-source-controls">

      <title>Image Source Control Reference</title>



      <note>

	<title>Experimental</title>



	<para>This is an <link

	linkend="experimental">experimental</link> interface and may

	change in the future.</para>

      </note>



      <para>

	The Image Source control class is intended for low-level

	control of image source devices such as image sensors. The
@@ -4862,14 +4847,6 @@ interface and may change in the future.</para> 
    <section id="image-process-controls">

      <title>Image Process Control Reference</title>



      <note>

	<title>Experimental</title>



	<para>This is an <link

	linkend="experimental">experimental</link> interface and may

	change in the future.</para>

      </note>



      <para>

	The Image Process control class is intended for low-level control of

	image processing functions. Unlike
@@ -4955,14 +4932,6 @@ interface and may change in the future.</para> 
    <section id="dv-controls">

      <title>Digital Video Control Reference</title>



      <note>

	<title>Experimental</title>



	<para>This is an <link

	linkend="experimental">experimental</link> interface and may

	change in the future.</para>

      </note>



      <para>

	The Digital Video control class is intended to control receivers

	and transmitters for <ulink url="http://en.wikipedia.org/wiki/Vga">VGA</ulink>,

Documentation/DocBook/media/v4l/dev-sdr.xml

+0 −6
Original line number Diff line number Diff line 
  <title>Software Defined Radio Interface (SDR)</title>



  <note>

    <title>Experimental</title>

    <para>This is an <link linkend="experimental"> experimental </link>

    interface and may change in the future.</para>

  </note>



  <para>

SDR is an abbreviation of Software Defined Radio, the radio device

which uses application software for modulation or demodulation. This interface