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

Pull media updates from Mauro Carvalho Chehab:
 - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4)
 - a new dvb frontend for ds2103 chipset (m88ds2103)
 - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf)
 - new drivers for R-Car VSP1
 - a new radio driver: radio-raremono
 - a new tuner driver for ts2022 chipset (m88ts2022)
 - the analog part of em28xx is now a separate module that only
   load/runs if the device is not a pure digital TV device
 - added a staging driver for bcm2048 radio devices
 - the omap 2 video driver (omap24xx) was moved to staging.  This driver
   is for an old hardware and uses a deprecated Kernel internal API.  If
   nobody cares enough to fix it, it would be removed on a couple Kernel
   releases
 - the sn9c102 driver was moved to staging.  This driver was replaced by
   gspca, and disabled on some distros, as almost all devices are known
   to work properly with gspca.  It should be removed from kernel on a
   couple Kernel releases
 - lots of driver fixes, improvements and cleanups

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits)
  [media] media: v4l2-dev: fix video device index assignment
  [media] rc-core: reuse device numbers
  [media] em28xx-cards: properly initialize the device bitmap
  [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c
  [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c
  [media] Staging: media: Fix quoted string split across line in as102_fe.c
  [media] media: st-rc: Add reset support
  [media] m2m-deinterlace: fix allocated struct type
  [media] radio-usb-si4713: fix sparse non static symbol warnings
  [media] em28xx-audio: remove needless check before usb_free_coherent()
  [media] au0828: Fix sparse non static symbol warning
  Revert "[media] go7007-usb: only use go->dev after allocated"
  [media] em28xx-audio: provide an error code when URB submit fails
  [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting
  [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0
  [media] em28xx: make 'em28xx_ctrl_ops' static
  em28xx-alsa: Fix error patch for init/fini
  [media] em28xx-audio: flush work at .fini
  [media] drxk: remove the option to load firmware asynchronously
  [media] em28xx: adjust period size at runtime
  ...

8 files changed, 238 insertions, 18 deletions

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 0c7195e3e093..c4cac6dbf9af 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2523,6 +2523,18 @@ that used it. It was originally scheduled for removal in 2.6.35.
       </orderedlist>
     </section>
 
+    <section>
+      <title>V4L2 in Linux 3.14</title>
+      <orderedlist>
+        <listitem>
+                <para> In struct <structname>v4l2_rect</structname>, the type
+of <structfield>width</structfield> and <structfield>height</structfield>
+fields changed from _s32 to _u32.
+          </para>
+        </listitem>
+      </orderedlist>
+    </section>
+
     <section id="other">
       <title>Relation of V4L2 to other Linux multimedia APIs</title>
 
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 7a3b49b3cc3b..a5a3188e5af7 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3161,6 +3161,47 @@ V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD as a golden frame.</entry>
                 </entrytbl>
               </row>
 
+              <row><entry></entry></row>
+              <row>
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_MIN_QP</constant></entry>
+                <entry>integer</entry>
+              </row>
+              <row><entry spanname="descr">Minimum quantization parameter for VP8.</entry>
+              </row>
+
+              <row><entry></entry></row>
+              <row>
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_MAX_QP</constant></entry>
+                <entry>integer</entry>
+              </row>
+              <row><entry spanname="descr">Maximum quantization parameter for VP8.</entry>
+              </row>
+
+              <row><entry></entry></row>
+              <row>
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP</constant>&nbsp;</entry>
+                <entry>integer</entry>
+              </row>
+              <row><entry spanname="descr">Quantization parameter for an I frame for VP8.</entry>
+              </row>
+
+              <row><entry></entry></row>
+              <row>
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP</constant>&nbsp;</entry>
+                <entry>integer</entry>
+              </row>
+              <row><entry spanname="descr">Quantization parameter for a P frame for VP8.</entry>
+              </row>
+
+              <row><entry></entry></row>
+              <row>
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_PROFILE</constant>&nbsp;</entry>
+                <entry>integer</entry>
+              </row>
+              <row><entry spanname="descr">Select the desired profile for VPx encoder.
+Acceptable values are 0, 1, 2 and 3 corresponding to encoder profiles 0, 1, 2 and 3.</entry>
+              </row>
+
           <row><entry></entry></row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/dev-overlay.xml b/Documentation/DocBook/media/v4l/dev-overlay.xml
index 40d1d7681439..cc6e0c5c960c 100644
--- a/Documentation/DocBook/media/v4l/dev-overlay.xml
+++ b/Documentation/DocBook/media/v4l/dev-overlay.xml
@@ -346,17 +346,14 @@ rectangle, in pixels.</entry>
 rectangle, in pixels. Offsets increase to the right and down.</entry>
           </row>
           <row>
-            <entry>__s32</entry>
+            <entry>__u32</entry>
             <entry><structfield>width</structfield></entry>
             <entry>Width of the rectangle, in pixels.</entry>
           </row>
           <row>
-            <entry>__s32</entry>
+            <entry>__u32</entry>
             <entry><structfield>height</structfield></entry>
-            <entry>Height of the rectangle, in pixels. Width and
-height cannot be negative, the fields are signed for hysterical
-reasons. <!-- video4linux-list@redhat.com on 22 Oct 2002 subject
-"Re:[V4L][patches!] Re:v4l2/kernel-2.5" --></entry>
+            <entry>Height of the rectangle, in pixels.</entry>
           </row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
index 355df43badc5..cf8548556c7d 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
@@ -134,6 +134,15 @@
             <entry>Output pad, relative to the entity. Output pads source data
             and are origins of links.</entry>
           </row>
+          <row>
+            <entry><constant>MEDIA_PAD_FL_MUST_CONNECT</constant></entry>
+            <entry>If this flag is set and the pad is linked to any other
+            pad, then at least one of those links must be enabled for the
+            entity to be able to stream. There could be temporary reasons
+            (e.g. device configuration dependent) for the pad to need
+            enabled links even when this flag isn't set; the absence of the
+            flag doesn't imply there is none.</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index f72c1cc93a9b..7331ce116f4c 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -89,7 +89,7 @@
       <constant>V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE</constant>.
       </para>
 
-      <para>The following tables list existing packet RGB formats.</para>
+      <para>The following tables list existing packed RGB formats.</para>
 
       <table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-rgb">
         <title>RGB formats</title>
@@ -615,7 +615,7 @@
         </mediaobject>
       </figure>
 
-      <para>The following table lists existing packet Bayer formats. The data
+      <para>The following table lists existing packed Bayer formats. The data
       organization is given as an example for the first pixel only.</para>
 
       <table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-bayer">
@@ -1178,7 +1178,7 @@
       U, Y, V, Y order will be named <constant>V4L2_MBUS_FMT_UYVY8_2X8</constant>.
       </para>
 
-        <para><xref linkend="v4l2-mbus-pixelcode-yuv8"/> list existing packet YUV
+        <para><xref linkend="v4l2-mbus-pixelcode-yuv8"/> lists existing packed YUV
         formats and describes the organization of each pixel data in each sample.
         When a format pattern is split across multiple samples each of the samples
         in the pattern is described.</para>
@@ -2492,6 +2492,163 @@
     </section>
 
     <section>
+      <title>HSV/HSL Formats</title>
+
+      <para>Those formats transfer pixel data as RGB values in a cylindrical-coordinate
+      system using Hue-Saturation-Value or Hue-Saturation-Lightness components. The
+      format code is made of the following information.
+      <itemizedlist>
+        <listitem><para>The hue, saturation, value or lightness and optional alpha
+        components order code, as encoded in a pixel sample. The only currently
+        supported value is AHSV.
+        </para></listitem>
+        <listitem><para>The number of bits per component, for each component. The values
+        can be different for all components. The only currently supported value is 8888.
+        </para></listitem>
+        <listitem><para>The number of bus samples per pixel. Pixels that are wider than
+        the bus width must be transferred in multiple samples. The only currently
+        supported value is 1.</para></listitem>
+        <listitem><para>The bus width.</para></listitem>
+        <listitem><para>For formats where the total number of bits per pixel is smaller
+        than the number of bus samples per pixel times the bus width, a padding
+        value stating if the bytes are padded in their most high order bits
+        (PADHI) or low order bits (PADLO).</para></listitem>
+        <listitem><para>For formats where the number of bus samples per pixel is larger
+        than 1, an endianness value stating if the pixel is transferred MSB first
+        (BE) or LSB first (LE).</para></listitem>
+      </itemizedlist>
+      </para>
+
+      <para>The following table lists existing HSV/HSL formats.</para>
+
+      <table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-hsv">
+        <title>HSV/HSL formats</title>
+        <tgroup cols="27">
+          <colspec colname="id" align="left" />
+          <colspec colname="code" align="center"/>
+          <colspec colname="bit" />
+          <colspec colnum="4" colname="b31" align="center" />
+          <colspec colnum="5" colname="b20" align="center" />
+          <colspec colnum="6" colname="b29" align="center" />
+          <colspec colnum="7" colname="b28" align="center" />
+          <colspec colnum="8" colname="b27" align="center" />
+          <colspec colnum="9" colname="b26" align="center" />
+          <colspec colnum="10" colname="b25" align="center" />
+          <colspec colnum="11" colname="b24" align="center" />
+          <colspec colnum="12" colname="b23" align="center" />
+          <colspec colnum="13" colname="b22" align="center" />
+          <colspec colnum="14" colname="b21" align="center" />
+          <colspec colnum="15" colname="b20" align="center" />
+          <colspec colnum="16" colname="b19" align="center" />
+          <colspec colnum="17" colname="b18" align="center" />
+          <colspec colnum="18" colname="b17" align="center" />
+          <colspec colnum="19" colname="b16" align="center" />
+          <colspec colnum="20" colname="b15" align="center" />
+          <colspec colnum="21" colname="b14" align="center" />
+          <colspec colnum="22" colname="b13" align="center" />
+          <colspec colnum="23" colname="b12" align="center" />
+          <colspec colnum="24" colname="b11" align="center" />
+          <colspec colnum="25" colname="b10" align="center" />
+          <colspec colnum="26" colname="b09" align="center" />
+          <colspec colnum="27" colname="b08" align="center" />
+          <colspec colnum="28" colname="b07" align="center" />
+          <colspec colnum="29" colname="b06" align="center" />
+          <colspec colnum="30" colname="b05" align="center" />
+          <colspec colnum="31" colname="b04" align="center" />
+          <colspec colnum="32" colname="b03" align="center" />
+          <colspec colnum="33" colname="b02" align="center" />
+          <colspec colnum="34" colname="b01" align="center" />
+          <colspec colnum="35" colname="b00" align="center" />
+          <spanspec namest="b31" nameend="b00" spanname="b0" />
+          <thead>
+            <row>
+              <entry>Identifier</entry>
+              <entry>Code</entry>
+              <entry></entry>
+              <entry spanname="b0">Data organization</entry>
+            </row>
+            <row>
+              <entry></entry>
+              <entry></entry>
+              <entry>Bit</entry>
+              <entry>31</entry>
+              <entry>30</entry>
+              <entry>29</entry>
+              <entry>28</entry>
+              <entry>27</entry>
+              <entry>26</entry>
+              <entry>25</entry>
+              <entry>24</entry>
+              <entry>23</entry>
+              <entry>22</entry>
+              <entry>21</entry>
+              <entry>20</entry>
+              <entry>19</entry>
+              <entry>18</entry>
+              <entry>17</entry>
+              <entry>16</entry>
+              <entry>15</entry>
+              <entry>14</entry>
+              <entry>13</entry>
+              <entry>12</entry>
+              <entry>11</entry>
+              <entry>10</entry>
+              <entry>9</entry>
+              <entry>8</entry>
+              <entry>7</entry>
+              <entry>6</entry>
+              <entry>5</entry>
+              <entry>4</entry>
+              <entry>3</entry>
+              <entry>2</entry>
+              <entry>1</entry>
+              <entry>0</entry>
+            </row>
+          </thead>
+          <tbody valign="top">
+            <row id="V4L2-MBUS-FMT-AHSV8888-1X32">
+              <entry>V4L2_MBUS_FMT_AHSV8888_1X32</entry>
+              <entry>0x6001</entry>
+              <entry></entry>
+              <entry>a<subscript>7</subscript></entry>
+              <entry>a<subscript>6</subscript></entry>
+              <entry>a<subscript>5</subscript></entry>
+              <entry>a<subscript>4</subscript></entry>
+              <entry>a<subscript>3</subscript></entry>
+              <entry>a<subscript>2</subscript></entry>
+              <entry>a<subscript>1</subscript></entry>
+              <entry>a<subscript>0</subscript></entry>
+              <entry>h<subscript>7</subscript></entry>
+              <entry>h<subscript>6</subscript></entry>
+              <entry>h<subscript>5</subscript></entry>
+              <entry>h<subscript>4</subscript></entry>
+              <entry>h<subscript>3</subscript></entry>
+              <entry>h<subscript>2</subscript></entry>
+              <entry>h<subscript>1</subscript></entry>
+              <entry>h<subscript>0</subscript></entry>
+              <entry>s<subscript>7</subscript></entry>
+              <entry>s<subscript>6</subscript></entry>
+              <entry>s<subscript>5</subscript></entry>
+              <entry>s<subscript>4</subscript></entry>
+              <entry>s<subscript>3</subscript></entry>
+              <entry>s<subscript>2</subscript></entry>
+              <entry>s<subscript>1</subscript></entry>
+              <entry>s<subscript>0</subscript></entry>
+              <entry>v<subscript>7</subscript></entry>
+              <entry>v<subscript>6</subscript></entry>
+              <entry>v<subscript>5</subscript></entry>
+              <entry>v<subscript>4</subscript></entry>
+              <entry>v<subscript>3</subscript></entry>
+              <entry>v<subscript>2</subscript></entry>
+              <entry>v<subscript>1</subscript></entry>
+              <entry>v<subscript>0</subscript></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </section>
+
+    <section>
       <title>JPEG Compressed Formats</title>
 
       <para>Those data formats consist of an ordered sequence of 8-bit bytes
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 8469fe13945c..74b7f27af71a 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -141,6 +141,14 @@ structs, ioctls) must be noted in more detail in the history chapter
 applications. -->
 
       <revision>
+        <revnumber>3.14</revnumber>
+        <date>2013-11-25</date>
+        <authorinitials>rr</authorinitials>
+        <revremark>Set width and height as unsigned on v4l2_rect.
+        </revremark>
+      </revision>
+
+      <revision>
         <revnumber>3.11</revnumber>
         <date>2013-05-26</date>
         <authorinitials>hv</authorinitials>
@@ -501,7 +509,7 @@ and discussions on the V4L mailing list.</revremark>
 </partinfo>
 
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 3.11</subtitle>
+ <subtitle>Revision 3.14</subtitle>
 
   <chapter id="common">
     &sub-common;
diff --git a/Documentation/DocBook/media/v4l/vidioc-cropcap.xml b/Documentation/DocBook/media/v4l/vidioc-cropcap.xml
index bf7cc979fdfa..1f5ed64cd75a 100644
--- a/Documentation/DocBook/media/v4l/vidioc-cropcap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-cropcap.xml
@@ -133,18 +133,14 @@ rectangle, in pixels.</entry>
 rectangle, in pixels.</entry>
           </row>
           <row>
-            <entry>__s32</entry>
+            <entry>__u32</entry>
             <entry><structfield>width</structfield></entry>
             <entry>Width of the rectangle, in pixels.</entry>
           </row>
           <row>
-            <entry>__s32</entry>
+            <entry>__u32</entry>
             <entry><structfield>height</structfield></entry>
-            <entry>Height of the rectangle, in pixels. Width
-and height cannot be negative, the fields are signed for
-hysterical reasons. <!-- video4linux-list@redhat.com
-on 22 Oct 2002 subject "Re:[V4L][patches!] Re:v4l2/kernel-2.5" -->
-</entry>
+            <entry>Height of the rectangle, in pixels.</entry>
           </row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/vidioc-streamon.xml b/Documentation/DocBook/media/v4l/vidioc-streamon.xml
index 716ea15e54a1..65dff55079d7 100644
--- a/Documentation/DocBook/media/v4l/vidioc-streamon.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-streamon.xml
@@ -59,7 +59,7 @@ buffers are filled (if there are any empty buffers in the incoming
 queue) until <constant>VIDIOC_STREAMON</constant> has been called.
 Accordingly the output hardware is disabled, no video signal is
 produced until <constant>VIDIOC_STREAMON</constant> has been called.
-The ioctl will succeed only when at least one output buffer is in the
+The ioctl will succeed when at least one output buffer is in the
 incoming queue.</para>
 
     <para>The <constant>VIDIOC_STREAMOFF</constant> ioctl, apart of