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

Commit 8762541f 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-media 

Pull second set of media updates from Mauro Carvalho Chehab:

 - radio API: add support to work with radio frequency bands

 - new AM/FM radio drivers: radio-shark, radio-shark2

 - new Remote Controller USB driver: iguanair

 - conversion of several drivers to the v4l2 core control framework

 - new board additions at existing drivers

 - the remaining (and vast majority of the patches) are due to
   drivers/DocBook fixes/cleanups.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits)
  [media] radio-tea5777: use library for 64bits div
  [media] tlg2300: Declare MODULE_FIRMWARE usage
  [media] lgs8gxx: Declare MODULE_FIRMWARE usage
  [media] xc5000: Add MODULE_FIRMWARE statements
  [media] s2255drv: Add MODULE_FIRMWARE statement
  [media] dib8000: move dereference after check for NULL
  [media] Documentation: Update cardlists
  [media] bttv: add support for Aposonic W-DVR
  [media] cx25821: Remove bad strcpy to read-only char*
  [media] pms.c: remove duplicated include
  [media] smiapp-core.c: remove duplicated include
  [media] via-camera: pass correct format settings to sensor
  [media] rtl2832.c: minor cleanup
  [media] Add support for the IguanaWorks USB IR Transceiver
  [media] Minor cleanups for MCE USB
  [media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry
  [media] Use a named union in struct v4l2_ioctl_info
  [media] mceusb: Add Twisted Melon USB IDs
  [media] staging/media/solo6x10: use module_pci_driver macro
  [media] staging/media/dt3155v4l: use module_pci_driver macro
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt
parents 6dbb35b0 adfe1560

Documentation/DocBook/media/v4l/compat.xml

+22 −1
Original line number Diff line number Diff line
@@ -2460,7 +2460,7 @@ that used it. It was originally scheduled for removal in 2.6.35. 
    </section>



    <section>

      <title>V4L2 in Linux 3.5</title>

      <title>V4L2 in Linux 3.6</title>

      <orderedlist>

	<listitem>

	  <para>Replaced <structfield>input</structfield> in
@@ -2471,6 +2471,24 @@ that used it. It was originally scheduled for removal in 2.6.35. 
      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.6</title>

      <orderedlist>

        <listitem>

	  <para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>

        </listitem>

      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.6</title>

      <orderedlist>

        <listitem>

	  <para>Added support for frequency band enumerations: &VIDIOC-ENUM-FREQ-BANDS;.</para>

        </listitem>

      </orderedlist>

    </section>



    <section id="other">

      <title>Relation of V4L2 to other Linux multimedia APIs</title>
@@ -2600,6 +2618,9 @@ ioctls.</para> 
	  <para><link linkend="v4l2-auto-focus-area"><constant>

	  V4L2_CID_AUTO_FOCUS_AREA</constant></link> control.</para>

        </listitem>

        <listitem>

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

        </listitem>

      </itemizedlist>

    </section>

Documentation/DocBook/media/v4l/controls.xml

+5 −0
Original line number Diff line number Diff line
@@ -372,6 +372,11 @@ minimum value disables backlight compensation.</entry> 
	    Cr component, bits [15:8] as Cb component and bits [31:16] must be zero.

	  </entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_AUTOBRIGHTNESS</constant></entry>

	    <entry>boolean</entry>

	    <entry>Enable Automatic Brightness.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_ROTATE</constant></entry>

	    <entry>integer</entry>

Documentation/DocBook/media/v4l/v4l2.xml

+6 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ structs, ioctls) must be noted in more detail in the history chapter 
applications. -->



      <revision>

	<revnumber>3.6</revnumber>

	<date>2012-07-02</date>

	<authorinitials>hv</authorinitials>

	<revremark>Added VIDIOC_ENUM_FREQ_BANDS.

	</revremark>

	<revnumber>3.5</revnumber>

	<date>2012-05-07</date>

	<authorinitials>sa, sn</authorinitials>
@@ -534,6 +539,7 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-enum-fmt;

    &sub-enum-framesizes;

    &sub-enum-frameintervals;

    &sub-enum-freq-bands;

    &sub-enuminput;

    &sub-enumoutput;

    &sub-enumstd;

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ different sizes.</para> 
    <para>To allocate device buffers applications initialize relevant fields of

the <structname>v4l2_create_buffers</structname> structure. They set the

<structfield>type</structfield> field in the

<structname>v4l2_format</structname> structure, embedded in this

&v4l2-format; structure, embedded in this

structure, to the respective stream or buffer type.

<structfield>count</structfield> must be set to the number of required buffers.

<structfield>memory</structfield> specifies the required I/O method. The
@@ -114,7 +114,7 @@ information.</para> 
/></entry>

	  </row>

	  <row>

	    <entry>struct&nbsp;v4l2_format</entry>

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

	    <entry><structfield>format</structfield></entry>

	    <entry>Filled in by the application, preserved by the driver.</entry>

	  </row>

Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml

+4 −10
Original line number Diff line number Diff line
@@ -54,15 +54,9 @@ 
      interface and may change in the future.</para>

    </note>



    <para>To query the available timings, applications initialize the

<structfield>index</structfield> field and zero the reserved array of &v4l2-dv-timings-cap;

and call the <constant>VIDIOC_DV_TIMINGS_CAP</constant> ioctl with a pointer to this

structure. Drivers fill the rest of the structure or return an

&EINVAL; when the index is out of bounds. To enumerate all supported DV timings,

applications shall begin at index zero, incrementing by one until the

driver returns <errorcode>EINVAL</errorcode>. Note that drivers may enumerate a

different set of DV timings after switching the video input or

output.</para>

    <para>To query the capabilities of the DV receiver/transmitter applications can call

this ioctl and the driver will fill in the structure. Note that drivers may return

different values after switching the video input or output.</para>



    <table pgwide="1" frame="none" id="v4l2-bt-timings-cap">

      <title>struct <structname>v4l2_bt_timings_cap</structname></title>
@@ -115,7 +109,7 @@ output.</para> 
	  <row>

	    <entry>__u32</entry>

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

	    <entry></entry>

	    <entry>Reserved for future extensions. Drivers must set the array to zero.</entry>

	  </row>

	</tbody>

      </tgroup>