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

Commit 1eb63378 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 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
  [media] pctv452e: Remove bogus code
  [media] adv7175: Make use of media bus pixel codes
  [media] media: vb2: fix incorrect return value
  [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
  [media] cx23885: Stop the risc video fifo before reconfiguring it
  [media] cx23885: Avoid incorrect error handling and reporting
  [media] cx23885: Avoid stopping the risc engine during buffer timeout
  [media] cx23885: Removed a spurious function cx23885_set_scale()
  [media] cx23885: v4l2 api compliance, set the audioset field correctly
  [media] cx23885: hook the audio selection functions into the main driver
  [media] cx23885: add generic functions for dealing with audio input selection
  [media] cx23885: fixes related to maximum number of inputs and range checking
  [media] cx23885: Initial support for the MPX-885 mini-card
  [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
  [media] cx23885: Enable audio line in support from the back panel
  [media] cx23885: Allow the audio mux config to be specified on a per input basis
  [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
  [media] cx23885: Name an internal i2c part and declare a bitfield by name
  [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
  [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
  ...

Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
file rename vs add)
parents 1a4ceab1 bac2dacd

Documentation/DocBook/media/dvb/dvbproperty.xml

+10 −14
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ typedef enum fe_delivery_system { 
	SYS_CMMB,

	SYS_DAB,

	SYS_DVBT2,

	SYS_TURBO,

} fe_delivery_system_t;

</programlisting>

		</section>
@@ -809,6 +810,8 @@ typedef enum fe_hierarchy { 
			<listitem><para><link linkend="DTV-INVERSION"><constant>DTV_INVERSION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-SYMBOL-RATE"><constant>DTV_SYMBOL_RATE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-INNER-FEC"><constant>DTV_INNER_FEC</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-VOLTAGE"><constant>DTV_VOLTAGE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-TONE"><constant>DTV_TONE</constant></link></para></listitem>

		</itemizedlist>

		<para>Future implementations might add those two missing parameters:</para>

		<itemizedlist mark='opencircle'>
@@ -818,25 +821,18 @@ typedef enum fe_hierarchy { 
	</section>

	<section id="dvbs2-params">

		<title>DVB-S2 delivery system</title>

		<para>The following parameters are valid for DVB-S2:</para>

		<para>In addition to all parameters valid for DVB-S, DVB-S2 supports the following parameters:</para>

		<itemizedlist mark='opencircle'>

			<listitem><para><link linkend="DTV-API-VERSION"><constant>DTV_API_VERSION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-DELIVERY-SYSTEM"><constant>DTV_DELIVERY_SYSTEM</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-TUNE"><constant>DTV_TUNE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-CLEAR"><constant>DTV_CLEAR</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-FREQUENCY"><constant>DTV_FREQUENCY</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-INVERSION"><constant>DTV_INVERSION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-SYMBOL-RATE"><constant>DTV_SYMBOL_RATE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-INNER-FEC"><constant>DTV_INNER_FEC</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-VOLTAGE"><constant>DTV_VOLTAGE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-TONE"><constant>DTV_TONE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-MODULATION"><constant>DTV_MODULATION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-PILOT"><constant>DTV_PILOT</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-ROLLOFF"><constant>DTV_ROLLOFF</constant></link></para></listitem>

		</itemizedlist>

		<para>Future implementations might add those two missing parameters:</para>

	</section>

	<section id="turbo-params">

		<title>Turbo code delivery system</title>

		<para>In addition to all parameters valid for DVB-S, turbo code supports the following parameters:</para>

		<itemizedlist mark='opencircle'>

			<listitem><para><link linkend="DTV-DISEQC-MASTER"><constant>DTV_DISEQC_MASTER</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-DISEQC-SLAVE-REPLY"><constant>DTV_DISEQC_SLAVE_REPLY</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-MODULATION"><constant>DTV_MODULATION</constant></link></para></listitem>

		</itemizedlist>

	</section>

	<section id="isdbs-params">

Documentation/DocBook/media/dvb/intro.xml

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ a partial path like:</para> 
additional include file <emphasis

role="tt">linux/dvb/version.h</emphasis> exists, which defines the

constant <emphasis role="tt">DVB_API_VERSION</emphasis>. This document

describes <emphasis role="tt">DVB_API_VERSION&#x00A0;3</emphasis>.

describes <emphasis role="tt">DVB_API_VERSION 5.4</emphasis>.

</para>



</section>

Documentation/DocBook/media/v4l/compat.xml

+8 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,14 @@ that used it. It was originally scheduled for removal in 2.6.35. 
        </listitem>

      </orderedlist>

    </section>

    <section>

      <title>V4L2 in Linux 3.2</title>

      <orderedlist>

        <listitem>

	  <para>V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace.</para>

        </listitem>

      </orderedlist>

    </section>



    <section id="other">

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

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 


      <para>When satisfied with the try results, applications can set the active

      formats by setting the <structfield>which</structfield> argument to

      <constant>V4L2_SUBDEV_FORMAT_TRY</constant>. Active formats are changed

      <constant>V4L2_SUBDEV_FORMAT_ACTIVE</constant>. Active formats are changed

      exactly as try formats by drivers. To avoid modifying the hardware state

      during format negotiation, applications should negotiate try formats first

      and then modify the active settings using the try formats returned during

Documentation/DocBook/media/v4l/v4l2.xml

+8 −1
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ 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.2</revnumber>

	<date>2011-08-26</date>

	<authorinitials>hv</authorinitials>

	<revremark>Added V4L2_CTRL_FLAG_VOLATILE.</revremark>

      </revision>



      <revision>

	<revnumber>3.1</revnumber>

	<date>2011-06-27</date>
@@ -410,7 +417,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



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

 <subtitle>Revision 3.1</subtitle>

 <subtitle>Revision 3.2</subtitle>



  <chapter id="common">

    &sub-common;