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

Pull media updates from Mauro Carvalho Chehab:

 - new IR driver: hix5hd2-ir

 - the virtual test driver (vivi) was replaced by vivid, with has an
   almost complete set of features to emulate most v4l2 devices and
   properly test all sorts of userspace apps

 - the as102 driver had several bugs fixed and was properly split into a
   frontend and a core driver.  With that, it got promoted from staging
   into mainstream

 - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver)

 - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522)

 - one new PCI driver for ISDB-T/ISDB-S (pt3 driver)

 - saa7134 driver got support for go7007-based devices

 - added a new PCI driver for Techwell 68xx chipsets (tw68)

 - a new platform driver was added (coda)

 - new tuner drivers: mxl301rf and qm1d1c0042

 - a new DVB USB driver was added for DVBSky S860 & similar devices

 - added a new SDR driver (hackrf)

 - usbtv got audio support

 - several platform drivers are now compiled with COMPILE_TEST

 - a series of compiler fixup patches, making sparse/spatch happier with
   the media stuff and removing several warnings, especially on those
   platform drivers that didn't use to compile on x86

 - Support for several new modern devices got added

 - lots of other fixes, improvements and cleanups

* tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

6 files changed, 121 insertions, 15 deletions

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 3a626d1b8f2e..07ffc76553ba 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2566,6 +2566,12 @@ fields changed from _s32 to _u32.
           <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
           </para>
         </listitem>
+      <title>V4L2 in Linux 3.18</title>
+      <orderedlist>
+        <listitem>
+          <para>Added <constant>V4L2_CID_PAN_SPEED</constant> and
+ <constant>V4L2_CID_TILT_SPEED</constant> camera controls.</para>
+        </listitem>
       </orderedlist>
     </section>
 
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 9f5ffd85560b..e013e4bf244c 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3965,6 +3965,27 @@ by exposure, white balance or focus controls.</entry>
           </row>
           <row><entry></entry></row>
 
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_PAN_SPEED</constant>&nbsp;</entry>
+            <entry>integer</entry>
+          </row><row><entry spanname="descr">This control turns the
+camera horizontally at the specific speed. The unit is undefined. A
+positive value moves the camera to the right (clockwise when viewed
+from above), a negative value to the left. A value of zero stops the motion
+if one is in progress and has no effect otherwise.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TILT_SPEED</constant>&nbsp;</entry>
+            <entry>integer</entry>
+          </row><row><entry spanname="descr">This control turns the
+camera vertically at the specified speed. The unit is undefined. A
+positive value moves the camera up, a negative value down. A value of zero
+stops the motion if one is in progress and has no effect otherwise.</entry>
+          </row>
+          <row><entry></entry></row>
+
         </tbody>
       </tgroup>
     </table>
@@ -4790,6 +4811,40 @@ interface and may change in the future.</para>
             conversion.
             </entry>
           </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_RED</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern red colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENR</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern green (next to red)
+            colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_BLUE</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern blue colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENB</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern green (next to blue)
+            colour component.
+            </entry>
+          </row>
           <row><entry></entry></row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
index 2aae8e9452a4..6ab4f0f3db64 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
@@ -237,9 +237,9 @@ for a pixel lie next to each other in memory.</para>
             <entry>g<subscript>4</subscript></entry>
             <entry>g<subscript>3</subscript></entry>
           </row>
-          <row id="V4L2-PIX-FMT-RGB555X">
-            <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
-            <entry>'RGBQ'</entry>
+          <row id="V4L2-PIX-FMT-ARGB555X">
+            <entry><constant>V4L2_PIX_FMT_ARGB555X</constant></entry>
+            <entry>'AR15' | (1 &lt;&lt; 31)</entry>
             <entry></entry>
             <entry>a</entry>
             <entry>r<subscript>4</subscript></entry>
@@ -259,6 +259,28 @@ for a pixel lie next to each other in memory.</para>
             <entry>b<subscript>1</subscript></entry>
             <entry>b<subscript>0</subscript></entry>
           </row>
+          <row id="V4L2-PIX-FMT-XRGB555X">
+            <entry><constant>V4L2_PIX_FMT_XRGB555X</constant></entry>
+            <entry>'XR15' | (1 &lt;&lt; 31)</entry>
+            <entry></entry>
+            <entry>-</entry>
+            <entry>r<subscript>4</subscript></entry>
+            <entry>r<subscript>3</subscript></entry>
+            <entry>r<subscript>2</subscript></entry>
+            <entry>r<subscript>1</subscript></entry>
+            <entry>r<subscript>0</subscript></entry>
+            <entry>g<subscript>4</subscript></entry>
+            <entry>g<subscript>3</subscript></entry>
+            <entry></entry>
+            <entry>g<subscript>2</subscript></entry>
+            <entry>g<subscript>1</subscript></entry>
+            <entry>g<subscript>0</subscript></entry>
+            <entry>b<subscript>4</subscript></entry>
+            <entry>b<subscript>3</subscript></entry>
+            <entry>b<subscript>2</subscript></entry>
+            <entry>b<subscript>1</subscript></entry>
+            <entry>b<subscript>0</subscript></entry>
+          </row>
           <row id="V4L2-PIX-FMT-RGB565X">
             <entry><constant>V4L2_PIX_FMT_RGB565X</constant></entry>
             <entry>'RGBR'</entry>
@@ -464,7 +486,7 @@ for a pixel lie next to each other in memory.</para>
           </row>
           <row id="V4L2-PIX-FMT-ARGB32">
             <entry><constant>V4L2_PIX_FMT_ARGB32</constant></entry>
-            <entry>'AX24'</entry>
+            <entry>'BA24'</entry>
             <entry></entry>
             <entry>a<subscript>7</subscript></entry>
             <entry>a<subscript>6</subscript></entry>
@@ -800,6 +822,28 @@ image</title>
             <entry>g<subscript>4</subscript></entry>
             <entry>g<subscript>3</subscript></entry>
           </row>
+          <row id="V4L2-PIX-FMT-RGB555X">
+            <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
+            <entry>'RGBQ'</entry>
+            <entry></entry>
+            <entry>a</entry>
+            <entry>r<subscript>4</subscript></entry>
+            <entry>r<subscript>3</subscript></entry>
+            <entry>r<subscript>2</subscript></entry>
+            <entry>r<subscript>1</subscript></entry>
+            <entry>r<subscript>0</subscript></entry>
+            <entry>g<subscript>4</subscript></entry>
+            <entry>g<subscript>3</subscript></entry>
+            <entry></entry>
+            <entry>g<subscript>2</subscript></entry>
+            <entry>g<subscript>1</subscript></entry>
+            <entry>g<subscript>0</subscript></entry>
+            <entry>b<subscript>4</subscript></entry>
+            <entry>b<subscript>3</subscript></entry>
+            <entry>b<subscript>2</subscript></entry>
+            <entry>b<subscript>1</subscript></entry>
+            <entry>b<subscript>0</subscript></entry>
+          </row>
           <row id="V4L2-PIX-FMT-BGR32">
             <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>
             <entry>'BGR4'</entry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
index cb7732582f03..b036f8963353 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
@@ -76,21 +76,22 @@
             <entry></entry>
             <entry>&v4l2-event-vsync;</entry>
             <entry><structfield>vsync</structfield></entry>
-            <entry>Event data for event V4L2_EVENT_VSYNC.
+            <entry>Event data for event <constant>V4L2_EVENT_VSYNC</constant>.
             </entry>
           </row>
           <row>
             <entry></entry>
             <entry>&v4l2-event-ctrl;</entry>
             <entry><structfield>ctrl</structfield></entry>
-            <entry>Event data for event V4L2_EVENT_CTRL.
+            <entry>Event data for event <constant>V4L2_EVENT_CTRL</constant>.
             </entry>
           </row>
           <row>
             <entry></entry>
             <entry>&v4l2-event-frame-sync;</entry>
             <entry><structfield>frame_sync</structfield></entry>
-            <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>
+            <entry>Event data for event
+            <constant>V4L2_EVENT_FRAME_SYNC</constant>.</entry>
           </row>
           <row>
             <entry></entry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-edid.xml b/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
index ce4563b87131..6df40db4c8ba 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-edid.xml
@@ -24,7 +24,7 @@
         <funcdef>int <function>ioctl</function></funcdef>
         <paramdef>int <parameter>fd</parameter></paramdef>
         <paramdef>int <parameter>request</parameter></paramdef>
-        <paramdef>const struct v4l2_edid *<parameter>argp</parameter></paramdef>
+        <paramdef>struct v4l2_edid *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
@@ -125,17 +125,17 @@
             <structfield>blocks</structfield> is 0, then the EDID is disabled or erased.</entry>
           </row>
           <row>
-            <entry>__u8&nbsp;*</entry>
-            <entry><structfield>edid</structfield></entry>
-            <entry>Pointer to memory that contains the EDID. The minimum size is
-            <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>
-          </row>
-          <row>
             <entry>__u32</entry>
             <entry><structfield>reserved</structfield>[5]</entry>
             <entry>Reserved for future extensions. Applications and drivers must
             set the array to zero.</entry>
           </row>
+          <row>
+            <entry>__u8&nbsp;*</entry>
+            <entry><structfield>edid</structfield></entry>
+            <entry>Pointer to memory that contains the EDID. The minimum size is
+            <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml b/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
index 9f6095608837..d7c9365ecdbe 100644
--- a/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
@@ -176,7 +176,7 @@
           </row>
           <row>
             <entry><constant>V4L2_EVENT_MOTION_DET</constant></entry>
-            <entry>5</entry>
+            <entry>6</entry>
             <entry>
               <para>Triggered whenever the motion detection state for one or more of the regions
               changes. This event has a &v4l2-event-motion-det; associated with it.</para>