Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next

rcar-du updates.

* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev: (281 commits)
  drm: rcar-du: Add tri-planar memory formats support
  drm: rcar-du: Add probe deferral debug messages
  drm: rcar-du: lvds: Add R-Car Gen3 support
  drm: rcar-du: lvds: Rename PLLEN bit to PLLON
  drm: rcar-du: lvds: Fix PLL frequency-related configuration
  drm: rcar-du: lvds: Avoid duplication of clock clamp code
  drm: rcar-du: Add R8A7795 device support
  drm: rcar-du: Output the DISP signal on the ODDF pin
  drm: rcar-du: Output the DISP signal on the DISP pin
  drm: rcar-du: Support up to 4 CRTCs
  drm: rcar-du: Drop LVDS double dependency on OF
  drm: rcar-du: Enable compilation on ARM64
  drm: rcar-du: Fix compile warning on 64-bit platforms
  drm: rcar-du: Expose the VSP1 compositor through KMS planes
  drm: rcar-du: Move plane allocator to rcar_du_plane.c
  drm: rcar-du: Restart the DU group when a plane source changes
  drm: rcar-du: Add VSP1 compositor support
  drm: rcar-du: Add VSP1 support to the planes allocator
  drm: rcar-du: Refactor plane setup
  drm: rcar-du: Compute plane DDCR4 register value directly
  ...

342 files changed, 10717 insertions, 3969 deletions

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index cdd8b24db68d..cc303a2f641c 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -229,6 +229,7 @@ X!Isound/sound_firmware.c
 !Iinclude/media/v4l2-dv-timings.h
 !Iinclude/media/v4l2-event.h
 !Iinclude/media/v4l2-flash-led-class.h
+!Iinclude/media/v4l2-mc.h
 !Iinclude/media/v4l2-mediabus.h
 !Iinclude/media/v4l2-mem2mem.h
 !Iinclude/media/v4l2-of.h
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index f13a429093f1..361040e6b0f4 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -2330,6 +2330,14 @@ vertical search range for motion estimation module in video encoder.</entry>
               </row>
 
               <row><entry></entry></row>
+              <row id="v4l2-mpeg-video-force-key-frame">
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME</constant>&nbsp;</entry>
+                <entry>button</entry>
+              </row><row><entry spanname="descr">Force a key frame for the next queued buffer. Applicable to encoders.
+This is a general, codec-agnostic keyframe control.</entry>
+              </row>
+
+              <row><entry></entry></row>
               <row>
                 <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE</constant>&nbsp;</entry>
                 <entry>integer</entry>
@@ -5070,6 +5078,46 @@ interface and may change in the future.</para>
             </entry>
           </row>
           <row>
+            <entry spanname="id"><constant>V4L2_CID_DV_TX_IT_CONTENT_TYPE</constant></entry>
+            <entry id="v4l2-dv-content-type">enum v4l2_dv_it_content_type</entry>
+          </row>
+          <row><entry spanname="descr">Configures the IT Content Type
+            of the transmitted video. This information is sent over HDMI and DisplayPort connectors
+            as part of the AVI InfoFrame. The term 'IT Content' is used for content that originates
+            from a computer as opposed to content from a TV broadcast or an analog source. The
+            enum&nbsp;v4l2_dv_it_content_type defines the possible content types:</entry>
+          </row>
+          <row>
+            <entrytbl spanname="descr" cols="2">
+              <tbody valign="top">
+                <row>
+                  <entry><constant>V4L2_DV_IT_CONTENT_TYPE_GRAPHICS</constant>&nbsp;</entry>
+                  <entry>Graphics content. Pixel data should be passed unfiltered and without
+                  analog reconstruction.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_DV_IT_CONTENT_TYPE_PHOTO</constant>&nbsp;</entry>
+                  <entry>Photo content. The content is derived from digital still pictures.
+                  The content should be passed through with minimal scaling and picture
+                  enhancements.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_DV_IT_CONTENT_TYPE_CINEMA</constant>&nbsp;</entry>
+                  <entry>Cinema content.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_DV_IT_CONTENT_TYPE_GAME</constant>&nbsp;</entry>
+                  <entry>Game content. Audio and video latency should be minimized.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_DV_IT_CONTENT_TYPE_NO_ITC</constant>&nbsp;</entry>
+                  <entry>No IT Content information is available and the ITC bit in the AVI
+                  InfoFrame is set to 0.</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+          <row>
             <entry spanname="id"><constant>V4L2_CID_DV_RX_POWER_PRESENT</constant></entry>
             <entry>bitmask</entry>
           </row>
@@ -5098,6 +5146,16 @@ interface and may change in the future.</para>
             This control is applicable to VGA, DVI-A/D, HDMI and DisplayPort connectors.
             </entry>
           </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_DV_RX_IT_CONTENT_TYPE</constant></entry>
+            <entry>enum v4l2_dv_it_content_type</entry>
+          </row>
+          <row><entry spanname="descr">Reads the IT Content Type
+            of the received video. This information is sent over HDMI and DisplayPort connectors
+            as part of the AVI InfoFrame. The term 'IT Content' is used for content that originates
+            from a computer as opposed to content from a TV broadcast or an analog source. See
+            <constant>V4L2_CID_DV_TX_IT_CONTENT_TYPE</constant> for the available content types.</entry>
+          </row>
           <row><entry></entry></row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
index 63152ab9efba..e0d49fa329f0 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
@@ -48,9 +48,6 @@
 
   <refsect1>
     <title>Description</title>
-
-    <para><emphasis role="bold">NOTE:</emphasis> This new ioctl is programmed to be added on Kernel 4.6. Its definition/arguments may change until its final version.</para>
-
     <para>The typical usage of this ioctl is to call it twice.
     On the first call, the structure defined at &media-v2-topology; should
     be zeroed. At return, if no errors happen, this ioctl will return the
diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml
index 1af384250910..8b4fa39cf611 100644
--- a/Documentation/DocBook/media/v4l/media-types.xml
+++ b/Documentation/DocBook/media/v4l/media-types.xml
@@ -57,10 +57,6 @@
             <entry>Connector for a RGB composite signal.</entry>
           </row>
           <row>
-            <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
-            <entry>Connector for a test generator.</entry>
-          </row>
-          <row>
             <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
             <entry>Camera video sensor entity.</entry>
           </row>
@@ -84,7 +80,34 @@
           </row>
           <row>
             <entry><constant>MEDIA_ENT_F_TUNER</constant></entry>
-            <entry>Digital TV, analog TV, radio and/or software radio tuner.</entry>
+            <entry>Digital TV, analog TV, radio and/or software radio tuner,
+                   with consists on a PLL tuning stage that converts radio
+                   frequency (RF) signal into an Intermediate Frequency (IF).
+                   Modern tuners have internally IF-PLL decoders for audio
+                   and video, but older models have those stages implemented
+                   on separate entities.
+            </entry>
+          </row>
+          <row>
+            <entry><constant>MEDIA_ENT_F_IF_VID_DECODER</constant></entry>
+            <entry>IF-PLL video decoder. It receives the IF from a PLL
+                   and decodes the analog TV video signal. This is commonly
+                   found on some very old analog tuners, like Philips MK3
+                   designs. They all contain a tda9887 (or some software
+                   compatible similar chip, like tda9885). Those devices
+                   use a different I2C address than the tuner PLL.
+            </entry>
+          </row>
+          <row>
+            <entry><constant>MEDIA_ENT_F_IF_AUD_DECODER</constant></entry>
+            <entry>IF-PLL sound decoder. It receives the IF from a PLL
+                   and decodes the analog TV audio signal. This is commonly
+                   found on some very old analog hardware, like Micronas
+                   msp3400, Philips tda9840, tda985x, etc. Those devices
+                   use a different I2C address than the tuner PLL and
+                   should be controlled together with the IF-PLL video
+                   decoder.
+            </entry>
           </row>
         </tbody>
       </tgroup>
diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml
index e781cc61786c..7d13fe96657d 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml
@@ -1,35 +1,43 @@
-    <refentry id="V4L2-PIX-FMT-YUV420M">
+    <refentry>
       <refmeta>
-        <refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>
+        <refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12'), V4L2_PIX_FMT_YVU420M ('YM21')</refentrytitle>
         &manvol;
       </refmeta>
       <refnamediv>
-        <refname> <constant>V4L2_PIX_FMT_YUV420M</constant></refname>
-        <refpurpose>Variation of <constant>V4L2_PIX_FMT_YUV420</constant>
-          with planes non contiguous in memory. </refpurpose>
+        <refname id="V4L2-PIX-FMT-YUV420M"><constant>V4L2_PIX_FMT_YUV420M</constant></refname>
+        <refname id="V4L2-PIX-FMT-YVU420M"><constant>V4L2_PIX_FMT_YVU420M</constant></refname>
+        <refpurpose>Variation of <constant>V4L2_PIX_FMT_YUV420</constant> and
+          <constant>V4L2_PIX_FMT_YVU420</constant> with planes non contiguous
+          in memory.</refpurpose>
       </refnamediv>
 
       <refsect1>
         <title>Description</title>
 
         <para>This is a multi-planar format, as opposed to a packed format.
-The three components are separated into three sub- images or planes.
+The three components are separated into three sub-images or planes.</para>
 
-The Y plane is first. The Y plane has one byte per pixel. The Cb data
+        <para>The Y plane is first. The Y plane has one byte per pixel.
+For <constant>V4L2_PIX_FMT_YUV420M</constant> the Cb data
 constitutes the second plane which is half the width and half
 the height of the Y plane (and of the image). Each Cb belongs to four
 pixels, a two-by-two square of the image. For example,
 Cb<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
 Y'<subscript>01</subscript>, Y'<subscript>10</subscript>, and
 Y'<subscript>11</subscript>. The Cr data, just like the Cb plane, is
-in the third plane. </para>
+in the third plane.</para>
+
+        <para><constant>V4L2_PIX_FMT_YVU420M</constant> is the same except
+the Cr data is stored in the second plane and the Cb data in the third plane.
+</para>
 
         <para>If the Y plane has pad bytes after each row, then the Cb
 and Cr planes have half as many pad bytes after their rows. In other
 words, two Cx rows (including padding) is exactly as long as one Y row
 (including padding).</para>
 
-        <para><constant>V4L2_PIX_FMT_YUV420M</constant> is intended to be
+        <para><constant>V4L2_PIX_FMT_YUV420M</constant> and
+<constant>V4L2_PIX_FMT_YVU420M</constant> are intended to be
 used only in drivers and applications that support the multi-planar API,
 described in <xref linkend="planar-apis"/>. </para>
 
diff --git a/Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml
index 2330667907c7..dd502802cb75 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml
@@ -1,40 +1,45 @@
-    <refentry id="V4L2-PIX-FMT-YVU420M">
+    <refentry>
       <refmeta>
-        <refentrytitle>V4L2_PIX_FMT_YVU420M ('YM21')</refentrytitle>
+        <refentrytitle>V4L2_PIX_FMT_YUV422M ('YM16'), V4L2_PIX_FMT_YVU422M ('YM61')</refentrytitle>
         &manvol;
       </refmeta>
       <refnamediv>
-        <refname> <constant>V4L2_PIX_FMT_YVU420M</constant></refname>
-        <refpurpose>Variation of <constant>V4L2_PIX_FMT_YVU420</constant>
-          with planes non contiguous in memory. </refpurpose>
+        <refname id="V4L2-PIX-FMT-YUV422M"><constant>V4L2_PIX_FMT_YUV422M</constant></refname>
+        <refname id="V4L2-PIX-FMT-YVU422M"><constant>V4L2_PIX_FMT_YVU422M</constant></refname>
+        <refpurpose>Planar formats with &frac12; horizontal resolution, also
+        known as YUV and YVU 4:2:2</refpurpose>
       </refnamediv>
 
       <refsect1>
         <title>Description</title>
 
         <para>This is a multi-planar format, as opposed to a packed format.
-The three components are separated into three sub-images or planes.
+The three components are separated into three sub-images or planes.</para>
 
-The Y plane is first. The Y plane has one byte per pixel. The Cr data
-constitutes the second plane which is half the width and half
-the height of the Y plane (and of the image). Each Cr belongs to four
-pixels, a two-by-two square of the image. For example,
-Cr<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
-Y'<subscript>01</subscript>, Y'<subscript>10</subscript>, and
-Y'<subscript>11</subscript>. The Cb data, just like the Cr plane, constitutes
-the third plane. </para>
+        <para>The Y plane is first. The Y plane has one byte per pixel.
+For <constant>V4L2_PIX_FMT_YUV422M</constant> the Cb data
+constitutes the second plane which is half the width of the Y plane (and of the
+image). Each Cb belongs to two pixels. For example,
+Cb<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
+Y'<subscript>01</subscript>. The Cr data, just like the Cb plane, is
+in the third plane. </para>
 
-        <para>If the Y plane has pad bytes after each row, then the Cr
-and Cb planes have half as many pad bytes after their rows. In other
+        <para><constant>V4L2_PIX_FMT_YVU422M</constant> is the same except
+the Cr data is stored in the second plane and the Cb data in the third plane.
+</para>
+
+        <para>If the Y plane has pad bytes after each row, then the Cb
+and Cr planes have half as many pad bytes after their rows. In other
 words, two Cx rows (including padding) is exactly as long as one Y row
 (including padding).</para>
 
-        <para><constant>V4L2_PIX_FMT_YVU420M</constant> is intended to be
+        <para><constant>V4L2_PIX_FMT_YUV422M</constant> and
+<constant>V4L2_PIX_FMT_YVU422M</constant> are intended to be
 used only in drivers and applications that support the multi-planar API,
 described in <xref linkend="planar-apis"/>. </para>
 
         <example>
-          <title><constant>V4L2_PIX_FMT_YVU420M</constant> 4 &times; 4
+          <title><constant>V4L2_PIX_FMT_YUV422M</constant> 4 &times; 4
 pixel image</title>
 
           <formalpara>
@@ -75,24 +80,44 @@ pixel image</title>
                     <row><entry></entry></row>
                     <row>
                       <entry>start1&nbsp;+&nbsp;0:</entry>
-                      <entry>Cr<subscript>00</subscript></entry>
-                      <entry>Cr<subscript>01</subscript></entry>
+                      <entry>Cb<subscript>00</subscript></entry>
+                      <entry>Cb<subscript>01</subscript></entry>
                     </row>
                     <row>
                       <entry>start1&nbsp;+&nbsp;2:</entry>
-                      <entry>Cr<subscript>10</subscript></entry>
-                      <entry>Cr<subscript>11</subscript></entry>
+                      <entry>Cb<subscript>10</subscript></entry>
+                      <entry>Cb<subscript>11</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;4:</entry>
+                      <entry>Cb<subscript>20</subscript></entry>
+                      <entry>Cb<subscript>21</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;6:</entry>
+                      <entry>Cb<subscript>30</subscript></entry>
+                      <entry>Cb<subscript>31</subscript></entry>
                     </row>
                     <row><entry></entry></row>
                     <row>
                       <entry>start2&nbsp;+&nbsp;0:</entry>
-                      <entry>Cb<subscript>00</subscript></entry>
-                      <entry>Cb<subscript>01</subscript></entry>
+                      <entry>Cr<subscript>00</subscript></entry>
+                      <entry>Cr<subscript>01</subscript></entry>
                     </row>
                     <row>
                       <entry>start2&nbsp;+&nbsp;2:</entry>
-                      <entry>Cb<subscript>10</subscript></entry>
-                      <entry>Cb<subscript>11</subscript></entry>
+                      <entry>Cr<subscript>10</subscript></entry>
+                      <entry>Cr<subscript>11</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;4:</entry>
+                      <entry>Cr<subscript>20</subscript></entry>
+                      <entry>Cr<subscript>21</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;6:</entry>
+                      <entry>Cr<subscript>30</subscript></entry>
+                      <entry>Cr<subscript>31</subscript></entry>
                     </row>
                   </tbody>
                 </tgroup>
@@ -113,36 +138,23 @@ pixel image</title>
                     </row>
                     <row>
                       <entry>0</entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry>
-                    </row>
-                    <row>
-                      <entry></entry>
-                      <entry></entry><entry>C</entry><entry></entry><entry></entry>
-                      <entry></entry><entry>C</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry>
                     </row>
                     <row>
                       <entry>1</entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry>
-                    </row>
-                    <row>
-                      <entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry>
                     </row>
                     <row>
                       <entry>2</entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry>
-                    </row>
-                    <row>
-                      <entry></entry>
-                      <entry></entry><entry>C</entry><entry></entry><entry></entry>
-                      <entry></entry><entry>C</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry>
                     </row>
                     <row>
                       <entry>3</entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
-                      <entry>Y</entry><entry></entry><entry>Y</entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                      <entry>Y</entry><entry>C</entry><entry>Y</entry>
                     </row>
                   </tbody>
                 </tgroup>
diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml
new file mode 100644
index 000000000000..1b7335940bc7
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml
@@ -0,0 +1,177 @@
+    <refentry>
+      <refmeta>
+        <refentrytitle>V4L2_PIX_FMT_YUV444M ('YM24'), V4L2_PIX_FMT_YVU444M ('YM42')</refentrytitle>
+        &manvol;
+      </refmeta>
+      <refnamediv>
+        <refname id="V4L2-PIX-FMT-YUV444M"><constant>V4L2_PIX_FMT_YUV444M</constant></refname>
+        <refname id="V4L2-PIX-FMT-YVU444M"><constant>V4L2_PIX_FMT_YVU444M</constant></refname>
+        <refpurpose>Planar formats with full horizontal resolution, also
+        known as YUV and YVU 4:4:4</refpurpose>
+      </refnamediv>
+
+      <refsect1>
+        <title>Description</title>
+
+        <para>This is a multi-planar format, as opposed to a packed format.
+The three components are separated into three sub-images or planes.</para>
+
+        <para>The Y plane is first. The Y plane has one byte per pixel.
+For <constant>V4L2_PIX_FMT_YUV444M</constant> the Cb data
+constitutes the second plane which is the same width and height as the Y plane
+(and as the image). The Cr data, just like the Cb plane, is in the third plane.
+</para>
+
+        <para><constant>V4L2_PIX_FMT_YVU444M</constant> is the same except
+the Cr data is stored in the second plane and the Cb data in the third plane.
+</para>
+        <para>If the Y plane has pad bytes after each row, then the Cb
+and Cr planes have the same number of pad bytes after their rows.</para>
+
+        <para><constant>V4L2_PIX_FMT_YUV444M</constant> and
+<constant>V4L2_PIX_FMT_YUV444M</constant> are intended to be
+used only in drivers and applications that support the multi-planar API,
+described in <xref linkend="planar-apis"/>. </para>
+
+        <example>
+          <title><constant>V4L2_PIX_FMT_YUV444M</constant> 4 &times; 4
+pixel image</title>
+
+          <formalpara>
+            <title>Byte Order.</title>
+            <para>Each cell is one byte.
+                <informaltable frame="none">
+                <tgroup cols="5" align="center">
+                  <colspec align="left" colwidth="2*" />
+                  <tbody valign="top">
+                    <row>
+                      <entry>start0&nbsp;+&nbsp;0:</entry>
+                      <entry>Y'<subscript>00</subscript></entry>
+                      <entry>Y'<subscript>01</subscript></entry>
+                      <entry>Y'<subscript>02</subscript></entry>
+                      <entry>Y'<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start0&nbsp;+&nbsp;4:</entry>
+                      <entry>Y'<subscript>10</subscript></entry>
+                      <entry>Y'<subscript>11</subscript></entry>
+                      <entry>Y'<subscript>12</subscript></entry>
+                      <entry>Y'<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start0&nbsp;+&nbsp;8:</entry>
+                      <entry>Y'<subscript>20</subscript></entry>
+                      <entry>Y'<subscript>21</subscript></entry>
+                      <entry>Y'<subscript>22</subscript></entry>
+                      <entry>Y'<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start0&nbsp;+&nbsp;12:</entry>
+                      <entry>Y'<subscript>30</subscript></entry>
+                      <entry>Y'<subscript>31</subscript></entry>
+                      <entry>Y'<subscript>32</subscript></entry>
+                      <entry>Y'<subscript>33</subscript></entry>
+                    </row>
+                    <row><entry></entry></row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;0:</entry>
+                      <entry>Cb<subscript>00</subscript></entry>
+                      <entry>Cb<subscript>01</subscript></entry>
+                      <entry>Cb<subscript>02</subscript></entry>
+                      <entry>Cb<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;4:</entry>
+                      <entry>Cb<subscript>10</subscript></entry>
+                      <entry>Cb<subscript>11</subscript></entry>
+                      <entry>Cb<subscript>12</subscript></entry>
+                      <entry>Cb<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;8:</entry>
+                      <entry>Cb<subscript>20</subscript></entry>
+                      <entry>Cb<subscript>21</subscript></entry>
+                      <entry>Cb<subscript>22</subscript></entry>
+                      <entry>Cb<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start1&nbsp;+&nbsp;12:</entry>
+                      <entry>Cb<subscript>20</subscript></entry>
+                      <entry>Cb<subscript>21</subscript></entry>
+                      <entry>Cb<subscript>32</subscript></entry>
+                      <entry>Cb<subscript>33</subscript></entry>
+                    </row>
+                    <row><entry></entry></row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;0:</entry>
+                      <entry>Cr<subscript>00</subscript></entry>
+                      <entry>Cr<subscript>01</subscript></entry>
+                      <entry>Cr<subscript>02</subscript></entry>
+                      <entry>Cr<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;4:</entry>
+                      <entry>Cr<subscript>10</subscript></entry>
+                      <entry>Cr<subscript>11</subscript></entry>
+                      <entry>Cr<subscript>12</subscript></entry>
+                      <entry>Cr<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;8:</entry>
+                      <entry>Cr<subscript>20</subscript></entry>
+                      <entry>Cr<subscript>21</subscript></entry>
+                      <entry>Cr<subscript>22</subscript></entry>
+                      <entry>Cr<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start2&nbsp;+&nbsp;12:</entry>
+                      <entry>Cr<subscript>30</subscript></entry>
+                      <entry>Cr<subscript>31</subscript></entry>
+                      <entry>Cr<subscript>32</subscript></entry>
+                      <entry>Cr<subscript>33</subscript></entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+                </informaltable>
+              </para>
+          </formalpara>
+
+          <formalpara>
+            <title>Color Sample Location.</title>
+            <para>
+                <informaltable frame="none">
+                <tgroup cols="7" align="center">
+                  <tbody valign="top">
+                    <row>
+                      <entry></entry>
+                      <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                      <entry>2</entry><entry></entry><entry>3</entry>
+                    </row>
+                    <row>
+                      <entry>0</entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry><entry></entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry>
+                    </row>
+                    <row>
+                      <entry>1</entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry><entry></entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry>
+                    </row>
+                    <row>
+                      <entry>2</entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry><entry></entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry>
+                    </row>
+                    <row>
+                      <entry>3</entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry><entry></entry>
+                      <entry>YC</entry><entry></entry><entry>YC</entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+                </informaltable>
+              </para>
+          </formalpara>
+        </example>
+      </refsect1>
+    </refentry>
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index d871245d2973..2f02f9441443 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -1628,7 +1628,8 @@ information.</para>
     &sub-y41p;
     &sub-yuv420;
     &sub-yuv420m;
-    &sub-yvu420m;
+    &sub-yuv422m;
+    &sub-yuv444m;
     &sub-yuv410;
     &sub-yuv422p;
     &sub-yuv411p;
diff --git a/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml
index e9c70a8f3476..0c93677d16b4 100644
--- a/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml
@@ -60,9 +60,19 @@ input</refpurpose>
 automatically, similar to sensing the video standard. To do so, applications
 call <constant>VIDIOC_QUERY_DV_TIMINGS</constant> with a pointer to a
 &v4l2-dv-timings;. Once the hardware detects the timings, it will fill in the
-timings structure.
+timings structure.</para>
 
-If the timings could not be detected because there was no signal, then
+<para>Please note that drivers shall <emphasis>not</emphasis> switch timings automatically
+if new timings are detected. Instead, drivers should send the
+<constant>V4L2_EVENT_SOURCE_CHANGE</constant> event (if they support this) and expect
+that userspace will take action by calling <constant>VIDIOC_QUERY_DV_TIMINGS</constant>.
+The reason is that new timings usually mean different buffer sizes as well, and you
+cannot change buffer sizes on the fly. In general, applications that receive the
+Source Change event will have to call <constant>VIDIOC_QUERY_DV_TIMINGS</constant>,
+and if the detected timings are valid they will have to stop streaming, set the new
+timings, allocate new buffers and start streaming again.</para>
+
+<para>If the timings could not be detected because there was no signal, then
 <errorcode>ENOLINK</errorcode> is returned. If a signal was detected, but
 it was unstable and the receiver could not lock to the signal, then
 <errorcode>ENOLCK</errorcode> is returned. If the receiver could lock to the signal,
diff --git a/Documentation/DocBook/media/v4l/vidioc-querystd.xml b/Documentation/DocBook/media/v4l/vidioc-querystd.xml
index 222348542182..3ceae35fab03 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querystd.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querystd.xml
@@ -59,6 +59,16 @@ then the driver will return V4L2_STD_UNKNOWN. When detection is not
 possible or fails, the set must contain all standards supported by the
 current video input or output.</para>
 
+<para>Please note that drivers shall <emphasis>not</emphasis> switch the video standard
+automatically if a new video standard is detected. Instead, drivers should send the
+<constant>V4L2_EVENT_SOURCE_CHANGE</constant> event (if they support this) and expect
+that userspace will take action by calling <constant>VIDIOC_QUERYSTD</constant>.
+The reason is that a new video standard can mean different buffer sizes as well, and you
+cannot change buffer sizes on the fly. In general, applications that receive the
+Source Change event will have to call <constant>VIDIOC_QUERYSTD</constant>,
+and if the detected video standard is valid they will have to stop streaming, set the new
+standard, allocate new buffers and start streaming again.</para>
+
   </refsect1>
 
   <refsect1>
diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
index eccd4f4867b2..0d30e42e40be 100644
--- a/Documentation/devicetree/bindings/display/renesas,du.txt
+++ b/Documentation/devicetree/bindings/display/renesas,du.txt
@@ -8,6 +8,7 @@ Required Properties:
     - "renesas,du-r8a7791" for R8A7791 (R-Car M2-W) compatible DU
     - "renesas,du-r8a7793" for R8A7793 (R-Car M2-N) compatible DU
     - "renesas,du-r8a7794" for R8A7794 (R-Car E2) compatible DU
+    - "renesas,du-r8a7795" for R8A7795 (R-Car H3) compatible DU
 
   - reg: A list of base address and length of each memory resource, one for
     each entry in the reg-names property.
@@ -24,7 +25,7 @@ Required Properties:
   - clock-names: Name of the clocks. This property is model-dependent.
     - R8A7779 uses a single functional clock. The clock doesn't need to be
       named.
-    - R8A779[0134] use one functional clock per channel and one clock per LVDS
+    - R8A779[01345] use one functional clock per channel and one clock per LVDS
       encoder (if available). The functional clocks must be named "du.x" with
       "x" being the channel numerical index. The LVDS clocks must be named
       "lvds.x" with "x" being the LVDS encoder numerical index.
@@ -41,13 +42,14 @@ bindings specified in Documentation/devicetree/bindings/graph.txt.
 The following table lists for each supported model the port number
 corresponding to each DU output.
 
-                Port 0          Port1           Port2
+                Port 0          Port1           Port2           Port3
 -----------------------------------------------------------------------------
- R8A7779 (H1)   DPAD 0          DPAD 1          -
- R8A7790 (H2)   DPAD            LVDS 0          LVDS 1
- R8A7791 (M2-W) DPAD            LVDS 0          -
- R8A7793 (M2-N) DPAD            LVDS 0          -
- R8A7794 (E2)   DPAD 0          DPAD 1          -
+ R8A7779 (H1)   DPAD 0          DPAD 1          -               -
+ R8A7790 (H2)   DPAD            LVDS 0          LVDS 1          -
+ R8A7791 (M2-W) DPAD            LVDS 0          -               -
+ R8A7793 (M2-N) DPAD            LVDS 0          -               -
+ R8A7794 (E2)   DPAD 0          DPAD 1          -               -
+ R8A7795 (H3)   DPAD            HDMI 0          HDMI 1          LVDS
 
 
 Example: R8A7790 (R-Car H2) DU
diff --git a/Documentation/devicetree/bindings/media/i2c/mt9v032.txt b/Documentation/devicetree/bindings/media/i2c/mt9v032.txt
index 202565313e82..100f0ae43269 100644
--- a/Documentation/devicetree/bindings/media/i2c/mt9v032.txt
+++ b/Documentation/devicetree/bindings/media/i2c/mt9v032.txt
@@ -20,6 +20,8 @@ Optional Properties:
 
 - link-frequencies: List of allowed link frequencies in Hz. Each frequency is
         expressed as a 64-bit big-endian integer.
+- reset-gpios: GPIO handle which is connected to the reset pin of the chip.
+- standby-gpios: GPIO handle which is connected to the standby pin of the chip.
 
 For further reading on port node refer to
 Documentation/devicetree/bindings/media/video-interfaces.txt.
diff --git a/Documentation/devicetree/bindings/media/i2c/tvp5150.txt b/Documentation/devicetree/bindings/media/i2c/tvp5150.txt
new file mode 100644
index 000000000000..daa20e43a8e3
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/tvp5150.txt
@@ -0,0 +1,88 @@
+* Texas Instruments TVP5150 and TVP5151 video decoders
+
+The TVP5150 and TVP5151 are video decoders that convert baseband NTSC and PAL
+(and also SECAM in the TVP5151 case) video signals to either 8-bit 4:2:2 YUV
+with discrete syncs or 8-bit ITU-R BT.656 with embedded syncs output formats.
+
+Required Properties:
+- compatible: value must be "ti,tvp5150"
+- reg: I2C slave address
+
+Optional Properties:
+- pdn-gpios: phandle for the GPIO connected to the PDN pin, if any.
+- reset-gpios: phandle for the GPIO connected to the RESETB pin, if any.
+
+Optional nodes:
+- connectors: The input connectors of tvp5150 have to be defined under
+  a subnode name "connectors" using the following format:
+
+        input-connector-name {
+                input connector properties
+        };
+
+Each input connector must contain the following properties:
+
+        - label: a name for the connector.
+        - input: the input connector.
+
+The possible values for the "input" property are:
+        0: Composite0
+        1: Composite1
+        2: S-Video
+
+and on a tvp5150am1 and tvp5151 there is another:
+        4: Signal generator
+
+The list of valid input connectors are defined in dt-bindings/media/tvp5150.h
+header file and can be included by device tree source files.
+
+Each input connector can be defined only once.
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Required Endpoint Properties for parallel synchronization:
+
+- hsync-active: active state of the HSYNC signal. Must be <1> (HIGH).
+- vsync-active: active state of the VSYNC signal. Must be <1> (HIGH).
+- field-even-active: field signal level during the even field data
+  transmission. Must be <0>.
+
+If none of hsync-active, vsync-active and field-even-active is specified,
+the endpoint is assumed to use embedded BT.656 synchronization.
+
+Example:
+
+&i2c2 {
+        ...
+        tvp5150@5c {
+                compatible = "ti,tvp5150";
+                reg = <0x5c>;
+                pdn-gpios = <&gpio4 30 GPIO_ACTIVE_LOW>;
+                reset-gpios = <&gpio6 7 GPIO_ACTIVE_LOW>;
+
+                connectors {
+                        composite0 {
+                                label = "Composite0";
+                                input = <TVP5150_COMPOSITE0>;
+                        };
+
+                        composite1 {
+                                label = "Composite1";
+                                input = <TVP5150_COMPOSITE1>;
+                        };
+
+                        s-video {
+                                label = "S-Video";
+                                input = <TVP5150_SVIDEO>;
+                        };
+                };
+
+                port {
+                        tvp5150_1: endpoint {
+                                remote-endpoint = <&ccdc_ep>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index 9dafe6b06cd2..619193ccf7ff 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -6,6 +6,7 @@ family of devices. The current blocks are always slaves and suppot one input
 channel which can be either RGB, YUYV or BT656.
 
  - compatible: Must be one of the following
+   - "renesas,vin-r8a7795" for the R8A7795 device
    - "renesas,vin-r8a7794" for the R8A7794 device
    - "renesas,vin-r8a7793" for the R8A7793 device
    - "renesas,vin-r8a7791" for the R8A7791 device
diff --git a/Documentation/devicetree/bindings/media/renesas,jpu.txt b/Documentation/devicetree/bindings/media/renesas,jpu.txt
index 0cb94201bf92..d3436e5190f9 100644
--- a/Documentation/devicetree/bindings/media/renesas,jpu.txt
+++ b/Documentation/devicetree/bindings/media/renesas,jpu.txt
@@ -5,11 +5,12 @@ and decoding function conforming to the JPEG baseline process, so that the JPU
 can encode image data and decode JPEG data quickly.
 
 Required properties:
-  - compatible: should containg one of the following:
-                        - "renesas,jpu-r8a7790" for R-Car H2
-                        - "renesas,jpu-r8a7791" for R-Car M2-W
-                        - "renesas,jpu-r8a7792" for R-Car V2H
-                        - "renesas,jpu-r8a7793" for R-Car M2-N
+- compatible: "renesas,jpu-<soctype>", "renesas,rcar-gen2-jpu" as fallback.
+        Examples with soctypes are:
+          - "renesas,jpu-r8a7790" for R-Car H2
+          - "renesas,jpu-r8a7791" for R-Car M2-W
+          - "renesas,jpu-r8a7792" for R-Car V2H
+          - "renesas,jpu-r8a7793" for R-Car M2-N
 
   - reg: Base address and length of the registers block for the JPU.
   - interrupts: JPU interrupt specifier.
@@ -17,7 +18,7 @@ Required properties:
 
 Example: R8A7790 (R-Car H2) JPU node
         jpeg-codec@fe980000 {
-                compatible = "renesas,jpu-r8a7790";
+                compatible = "renesas,jpu-r8a7790", "renesas,rcar-gen2-jpu";
                 reg = <0 0xfe980000 0 0x10300>;
                 interrupts = <0 272 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp1_clks R8A7790_CLK_JPU>;
diff --git a/Documentation/devicetree/bindings/media/renesas,vsp1.txt b/Documentation/devicetree/bindings/media/renesas,vsp1.txt
index 87fe08abf36d..627405abd144 100644
--- a/Documentation/devicetree/bindings/media/renesas,vsp1.txt
+++ b/Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@ -1,30 +1,18 @@
-* Renesas VSP1 Video Processing Engine
+* Renesas VSP Video Processing Engine
 
-The VSP1 is a video processing engine that supports up-/down-scaling, alpha
+The VSP is a video processing engine that supports up-/down-scaling, alpha
 blending, color space conversion and various other image processing features.
 It can be found in the Renesas R-Car second generation SoCs.
 
 Required properties:
 
-  - compatible: Must contain "renesas,vsp1"
+  - compatible: Must contain one of the following values
+    - "renesas,vsp1" for the R-Car Gen2 VSP1
+    - "renesas,vsp2" for the R-Car Gen3 VSP2
 
-  - reg: Base address and length of the registers block for the VSP1.
-  - interrupts: VSP1 interrupt specifier.
-  - clocks: A phandle + clock-specifier pair for the VSP1 functional clock.
-
-  - renesas,#rpf: Number of Read Pixel Formatter (RPF) modules in the VSP1.
-  - renesas,#uds: Number of Up Down Scaler (UDS) modules in the VSP1.
-  - renesas,#wpf: Number of Write Pixel Formatter (WPF) modules in the VSP1.
-
-
-Optional properties:
-
-  - renesas,has-lif: Boolean, indicates that the LCD Interface (LIF) module is
-    available.
-  - renesas,has-lut: Boolean, indicates that the Look Up Table (LUT) module is
-    available.
-  - renesas,has-sru: Boolean, indicates that the Super Resolution Unit (SRU)
-    module is available.
+  - reg: Base address and length of the registers block for the VSP.
+  - interrupts: VSP interrupt specifier.
+  - clocks: A phandle + clock-specifier pair for the VSP functional clock.
 
 
 Example: R8A7790 (R-Car H2) VSP1-S node
@@ -34,10 +22,4 @@ Example: R8A7790 (R-Car H2) VSP1-S node
                 reg = <0 0xfe928000 0 0x8000>;
                 interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
-
-                renesas,has-lut;
-                renesas,has-sru;
-                renesas,#rpf = <5>;
-                renesas,#uds = <3>;
-                renesas,#wpf = <4>;
         };
diff --git a/Documentation/devicetree/bindings/media/ti-cal.txt b/Documentation/devicetree/bindings/media/ti-cal.txt
new file mode 100644
index 000000000000..ae9b52f37576
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti-cal.txt
@@ -0,0 +1,72 @@
+Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL)
+------------------------------------------------------
+
+The Camera Adaptation Layer (CAL) is a key component for image capture
+applications. The capture module provides the system interface and the
+processing capability to connect CSI2 image-sensor modules to the
+DRA72x device.
+
+Required properties:
+- compatible: must be "ti,dra72-cal"
+- reg:  CAL Top level, Receiver Core #0, Receiver Core #1 and Camera RX
+        control address space
+- reg-names: cal_top, cal_rx_core0, cal_rx_core1, and camerrx_control
+             registers
+- interrupts: should contain IRQ line for the CAL;
+
+CAL supports 2 camera port nodes on MIPI bus. Each CSI2 camera port nodes
+should contain a 'port' child node with child 'endpoint' node. Please
+refer to the bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+        cal: cal@4845b000 {
+                compatible = "ti,dra72-cal";
+                ti,hwmods = "cal";
+                reg = <0x4845B000 0x400>,
+                      <0x4845B800 0x40>,
+                      <0x4845B900 0x40>,
+                      <0x4A002e94 0x4>;
+                reg-names = "cal_top",
+                            "cal_rx_core0",
+                            "cal_rx_core1",
+                            "camerrx_control";
+                interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        csi2_0: port@0 {
+                                reg = <0>;
+                                endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&ar0330_1>;
+                                };
+                        };
+                        csi2_1: port@1 {
+                                reg = <1>;
+                        };
+                };
+        };
+
+        i2c5: i2c@4807c000 {
+                ar0330@10 {
+                        compatible = "ti,ar0330";
+                        reg = <0x10>;
+
+                        port {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                ar0330_1: endpoint {
+                                        reg = <0>;
+                                        clock-lanes = <1>;
+                                        data-lanes = <0 2 3 4>;
+                                        remote-endpoint = <&csi2_0>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index 669dc6ce4330..6f4b12f7b844 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -190,7 +190,7 @@ and watch another one.
 Patches, comments and suggestions are very very welcome.
 
 3. Acknowledgements
-   Amaury Demol (ademol@dibcom.fr) and Francois Kanounnikoff from DiBcom for
+   Amaury Demol (Amaury.Demol@parrot.com) and Francois Kanounnikoff from DiBcom for
     providing specs, code and help, on which the dvb-dibusb, dib3000mb and
     dib3000mc are based.
 
diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/video4linux/v4l2-controls.txt
index 5517db602f37..5e759cab4538 100644
--- a/Documentation/video4linux/v4l2-controls.txt
+++ b/Documentation/video4linux/v4l2-controls.txt
@@ -647,7 +647,6 @@ Or you can add specific controls to a handler:
         volume = v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_AUDIO_VOLUME, ...);
         v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_BRIGHTNESS, ...);
         v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_CONTRAST, ...);
-        v4l2_ctrl_add_ctrl(&radio_ctrl_handler, volume);
 
 What you should not do is make two identical controls for two handlers.
 For example:
diff --git a/MAINTAINERS b/MAINTAINERS
index c647c40e141d..5673421670a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10855,6 +10855,14 @@ L:	linux-omap@vger.kernel.org
 S:      Maintained
 F:      drivers/thermal/ti-soc-thermal/
 
+TI VPE/CAL DRIVERS
+M:      Benoit Parrot <bparrot@ti.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/platform/ti-vpe/
+
 TI CDCE706 CLOCK DRIVER
 M:      Max Filippov <jcmvbkbc@gmail.com>
 S:      Maintained
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 96dcd4a78951..1f10fa0928b4 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -1,6 +1,7 @@
 config DRM_RCAR_DU
         tristate "DRM Support for R-Car Display Unit"
-        depends on DRM && ARM && OF
+        depends on DRM && OF
+        depends on ARM || ARM64
         depends on ARCH_SHMOBILE || COMPILE_TEST
         select DRM_KMS_HELPER
         select DRM_KMS_CMA_HELPER
@@ -14,14 +15,18 @@ config DRM_RCAR_DU
 config DRM_RCAR_HDMI
         bool "R-Car DU HDMI Encoder Support"
         depends on DRM_RCAR_DU
-        depends on OF
         help
           Enable support for external HDMI encoders.
 
 config DRM_RCAR_LVDS
         bool "R-Car DU LVDS Encoder Support"
         depends on DRM_RCAR_DU
-        depends on ARCH_R8A7790 || ARCH_R8A7791 || COMPILE_TEST
         help
-          Enable support for the R-Car Display Unit embedded LVDS encoders
-          (currently only on R8A7790 and R8A7791).
+          Enable support for the R-Car Display Unit embedded LVDS encoders.
+
+config DRM_RCAR_VSP
+        bool "R-Car DU VSP Compositor Support"
+        depends on DRM_RCAR_DU
+        depends on VIDEO_RENESAS_VSP1
+        help
+          Enable support to expose the R-Car VSP Compositor as KMS planes.
diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile
index 05de1c4097af..827711e28226 100644
--- a/drivers/gpu/drm/rcar-du/Makefile
+++ b/drivers/gpu/drm/rcar-du/Makefile
@@ -11,4 +11,6 @@ rcar-du-drm-$(CONFIG_DRM_RCAR_HDMI)	+= rcar_du_hdmicon.o \
                                            rcar_du_hdmienc.o
 rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS)     += rcar_du_lvdsenc.o
 
+rcar-du-drm-$(CONFIG_DRM_RCAR_VSP)      += rcar_du_vsp.o
+
 obj-$(CONFIG_DRM_RCAR_DU)               += rcar-du-drm.o
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 4ec80ae1fa99..51e9e8ce551a 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -1,7 +1,7 @@
 /*
  * rcar_du_crtc.c  --  R-Car Display Unit CRTCs
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -28,6 +28,7 @@
 #include "rcar_du_kms.h"
 #include "rcar_du_plane.h"
 #include "rcar_du_regs.h"
+#include "rcar_du_vsp.h"
 
 static u32 rcar_du_crtc_read(struct rcar_du_crtc *rcrtc, u32 reg)
 {
@@ -150,7 +151,7 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
         /* Signal polarities */
         value = ((mode->flags & DRM_MODE_FLAG_PVSYNC) ? 0 : DSMR_VSL)
               | ((mode->flags & DRM_MODE_FLAG_PHSYNC) ? 0 : DSMR_HSL)
-              | DSMR_DIPM_DE | DSMR_CSPM;
+              | DSMR_DIPM_DISP | DSMR_CSPM;
         rcar_du_crtc_write(rcrtc, DSMR, value);
 
         /* Display timings */
@@ -207,6 +208,7 @@ plane_format(struct rcar_du_plane *plane)
 static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc)
 {
         struct rcar_du_plane *planes[RCAR_DU_NUM_HW_PLANES];
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
         unsigned int num_planes = 0;
         unsigned int dptsr_planes;
         unsigned int hwplanes = 0;
@@ -250,6 +252,17 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc)
                 }
         }
 
+        /* If VSP+DU integration is enabled the plane assignment is fixed. */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE)) {
+                if (rcdu->info->gen < 3) {
+                        dspr = (rcrtc->index % 2) + 1;
+                        hwplanes = 1 << (rcrtc->index % 2);
+                } else {
+                        dspr = (rcrtc->index % 2) ? 3 : 1;
+                        hwplanes = 1 << ((rcrtc->index % 2) ? 2 : 0);
+                }
+        }
+
         /* Update the planes to display timing and dot clock generator
          * associations.
          *
@@ -272,6 +285,10 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc)
                         rcar_du_group_restart(rcrtc->group);
         }
 
+        /* Restart the group if plane sources have changed. */
+        if (rcrtc->group->need_restart)
+                rcar_du_group_restart(rcrtc->group);
+
         mutex_unlock(&rcrtc->group->lock);
 
         rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? DS2PR : DS1PR,
@@ -365,6 +382,10 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
 
         rcar_du_group_start_stop(rcrtc->group, true);
 
+        /* Enable the VSP compositor. */
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
+                rcar_du_vsp_enable(rcrtc);
+
         /* Turn vertical blanking interrupt reporting back on. */
         drm_crtc_vblank_on(crtc);
 
@@ -398,6 +419,10 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
         rcar_du_crtc_wait_page_flip(rcrtc);
         drm_crtc_vblank_off(crtc);
 
+        /* Disable the VSP compositor. */
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
+                rcar_du_vsp_disable(rcrtc);
+
         /* Select switch sync mode. This stops display operation and configures
          * the HSYNC and VSYNC signals as inputs.
          */
@@ -410,6 +435,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
 
 void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc)
 {
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
+                rcar_du_vsp_disable(rcrtc);
+
         rcar_du_crtc_stop(rcrtc);
         rcar_du_crtc_put(rcrtc);
 }
@@ -418,20 +446,24 @@ void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc)
 {
         unsigned int i;
 
-        if (!rcrtc->enabled)
+        if (!rcrtc->crtc.state->active)
                 return;
 
         rcar_du_crtc_get(rcrtc);
         rcar_du_crtc_start(rcrtc);
 
         /* Commit the planes state. */
-        for (i = 0; i < rcrtc->group->num_planes; ++i) {
-                struct rcar_du_plane *plane = &rcrtc->group->planes[i];
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE)) {
+                rcar_du_vsp_enable(rcrtc);
+        } else {
+                for (i = 0; i < rcrtc->group->num_planes; ++i) {
+                        struct rcar_du_plane *plane = &rcrtc->group->planes[i];
 
-                if (plane->plane.state->crtc != &rcrtc->crtc)
-                        continue;
+                        if (plane->plane.state->crtc != &rcrtc->crtc)
+                                continue;
 
-                rcar_du_plane_setup(plane);
+                        rcar_du_plane_setup(plane);
+                }
         }
 
         rcar_du_crtc_update_planes(rcrtc);
@@ -445,26 +477,17 @@ static void rcar_du_crtc_enable(struct drm_crtc *crtc)
 {
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 
-        if (rcrtc->enabled)
-                return;
-
         rcar_du_crtc_get(rcrtc);
         rcar_du_crtc_start(rcrtc);
-
-        rcrtc->enabled = true;
 }
 
 static void rcar_du_crtc_disable(struct drm_crtc *crtc)
 {
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 
-        if (!rcrtc->enabled)
-                return;
-
         rcar_du_crtc_stop(rcrtc);
         rcar_du_crtc_put(rcrtc);
 
-        rcrtc->enabled = false;
         rcrtc->outputs = 0;
 }
 
@@ -491,6 +514,9 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc,
                 rcrtc->event = event;
                 spin_unlock_irqrestore(&dev->event_lock, flags);
         }
+
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
+                rcar_du_vsp_atomic_begin(rcrtc);
 }
 
 static void rcar_du_crtc_atomic_flush(struct drm_crtc *crtc,
@@ -499,6 +525,9 @@ static void rcar_du_crtc_atomic_flush(struct drm_crtc *crtc,
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 
         rcar_du_crtc_update_planes(rcrtc);
+
+        if (rcar_du_has(rcrtc->group->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
+                rcar_du_vsp_atomic_flush(rcrtc);
 }
 
 static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
@@ -547,13 +576,14 @@ static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
 int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 {
         static const unsigned int mmio_offsets[] = {
-                DU0_REG_OFFSET, DU1_REG_OFFSET, DU2_REG_OFFSET
+                DU0_REG_OFFSET, DU1_REG_OFFSET, DU2_REG_OFFSET, DU3_REG_OFFSET
         };
 
         struct rcar_du_device *rcdu = rgrp->dev;
         struct platform_device *pdev = to_platform_device(rcdu->dev);
         struct rcar_du_crtc *rcrtc = &rcdu->crtcs[index];
         struct drm_crtc *crtc = &rcrtc->crtc;
+        struct drm_plane *primary;
         unsigned int irqflags;
         struct clk *clk;
         char clk_name[9];
@@ -589,10 +619,13 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
         rcrtc->group = rgrp;
         rcrtc->mmio_offset = mmio_offsets[index];
         rcrtc->index = index;
-        rcrtc->enabled = false;
 
-        ret = drm_crtc_init_with_planes(rcdu->ddev, crtc,
-                                        &rgrp->planes[index % 2].plane,
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
+                primary = &rcrtc->vsp->planes[0].plane;
+        else
+                primary = &rgrp->planes[index % 2].plane;
+
+        ret = drm_crtc_init_with_planes(rcdu->ddev, crtc, primary,
                                         NULL, &crtc_funcs, NULL);
         if (ret < 0)
                 return ret;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
index 2bbe3f5aab65..6f08b7e7db06 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
@@ -21,6 +21,7 @@
 #include <drm/drm_crtc.h>
 
 struct rcar_du_group;
+struct rcar_du_vsp;
 
 /**
  * struct rcar_du_crtc - the CRTC, representing a DU superposition processor
@@ -33,7 +34,6 @@ struct rcar_du_group;
  * @event: event to post when the pending page flip completes
  * @flip_wait: wait queue used to signal page flip completion
  * @outputs: bitmask of the outputs (enum rcar_du_output) driven by this CRTC
- * @enabled: whether the CRTC is enabled, used to control system resume
  * @group: CRTC group this CRTC belongs to
  */
 struct rcar_du_crtc {
@@ -49,9 +49,9 @@ struct rcar_du_crtc {
         wait_queue_head_t flip_wait;
 
         unsigned int outputs;
-        bool enabled;
 
         struct rcar_du_group *group;
+        struct rcar_du_vsp *vsp;
 };
 
 #define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 0bb2b31555bf..ed6006bf6bd8 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -1,7 +1,7 @@
 /*
  * rcar_du_drv.c  --  R-Car Display Unit DRM driver
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -36,6 +36,7 @@
  */
 
 static const struct rcar_du_device_info rcar_du_r8a7779_info = {
+        .gen = 2,
         .features = 0,
         .num_crtcs = 2,
         .routes = {
@@ -57,6 +58,7 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = {
 };
 
 static const struct rcar_du_device_info rcar_du_r8a7790_info = {
+        .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
         .quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES,
@@ -86,6 +88,7 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = {
 
 /* M2-W (r8a7791) and M2-N (r8a7793) are identical */
 static const struct rcar_du_device_info rcar_du_r8a7791_info = {
+        .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
         .num_crtcs = 2,
@@ -108,6 +111,7 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = {
 };
 
 static const struct rcar_du_device_info rcar_du_r8a7794_info = {
+        .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
         .num_crtcs = 2,
@@ -129,12 +133,37 @@ static const struct rcar_du_device_info rcar_du_r8a7794_info = {
         .num_lvds = 0,
 };
 
+static const struct rcar_du_device_info rcar_du_r8a7795_info = {
+        .gen = 3,
+        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
+                  | RCAR_DU_FEATURE_EXT_CTRL_REGS
+                  | RCAR_DU_FEATURE_VSP1_SOURCE,
+        .num_crtcs = 4,
+        .routes = {
+                /* R8A7795 has one RGB output, one LVDS output and two
+                 * (currently unsupported) HDMI outputs.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(3),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                        .port = 0,
+                },
+                [RCAR_DU_OUTPUT_LVDS0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                        .port = 3,
+                },
+        },
+        .num_lvds = 1,
+};
+
 static const struct of_device_id rcar_du_of_table[] = {
         { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info },
         { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info },
         { .compatible = "renesas,du-r8a7791", .data = &rcar_du_r8a7791_info },
         { .compatible = "renesas,du-r8a7793", .data = &rcar_du_r8a7791_info },
         { .compatible = "renesas,du-r8a7794", .data = &rcar_du_r8a7794_info },
+        { .compatible = "renesas,du-r8a7795", .data = &rcar_du_r8a7795_info },
         { }
 };
 
@@ -144,82 +173,6 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table);
  * DRM operations
  */
 
-static int rcar_du_unload(struct drm_device *dev)
-{
-        struct rcar_du_device *rcdu = dev->dev_private;
-
-        if (rcdu->fbdev)
-                drm_fbdev_cma_fini(rcdu->fbdev);
-
-        drm_kms_helper_poll_fini(dev);
-        drm_mode_config_cleanup(dev);
-        drm_vblank_cleanup(dev);
-
-        dev->irq_enabled = 0;
-        dev->dev_private = NULL;
-
-        return 0;
-}
-
-static int rcar_du_load(struct drm_device *dev, unsigned long flags)
-{
-        struct platform_device *pdev = dev->platformdev;
-        struct device_node *np = pdev->dev.of_node;
-        struct rcar_du_device *rcdu;
-        struct resource *mem;
-        int ret;
-
-        if (np == NULL) {
-                dev_err(dev->dev, "no platform data\n");
-                return -ENODEV;
-        }
-
-        rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL);
-        if (rcdu == NULL) {
-                dev_err(dev->dev, "failed to allocate private data\n");
-                return -ENOMEM;
-        }
-
-        init_waitqueue_head(&rcdu->commit.wait);
-
-        rcdu->dev = &pdev->dev;
-        rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data;
-        rcdu->ddev = dev;
-        dev->dev_private = rcdu;
-
-        /* I/O resources */
-        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
-        if (IS_ERR(rcdu->mmio))
-                return PTR_ERR(rcdu->mmio);
-
-        /* Initialize vertical blanking interrupts handling. Start with vblank
-         * disabled for all CRTCs.
-         */
-        ret = drm_vblank_init(dev, (1 << rcdu->info->num_crtcs) - 1);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize vblank\n");
-                goto done;
-        }
-
-        /* DRM/KMS objects */
-        ret = rcar_du_modeset_init(rcdu);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret);
-                goto done;
-        }
-
-        dev->irq_enabled = 1;
-
-        platform_set_drvdata(pdev, rcdu);
-
-done:
-        if (ret)
-                rcar_du_unload(dev);
-
-        return ret;
-}
-
 static void rcar_du_lastclose(struct drm_device *dev)
 {
         struct rcar_du_device *rcdu = dev->dev_private;
@@ -260,10 +213,7 @@ static const struct file_operations rcar_du_fops = {
 static struct drm_driver rcar_du_driver = {
         .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME
                                 | DRIVER_ATOMIC,
-        .load                   = rcar_du_load,
-        .unload                 = rcar_du_unload,
         .lastclose              = rcar_du_lastclose,
-        .set_busid              = drm_platform_set_busid,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = rcar_du_enable_vblank,
         .disable_vblank         = rcar_du_disable_vblank,
@@ -323,18 +273,116 @@ static const struct dev_pm_ops rcar_du_pm_ops = {
  * Platform driver
  */
 
-static int rcar_du_probe(struct platform_device *pdev)
+static int rcar_du_remove(struct platform_device *pdev)
 {
-        return drm_platform_init(&rcar_du_driver, pdev);
+        struct rcar_du_device *rcdu = platform_get_drvdata(pdev);
+        struct drm_device *ddev = rcdu->ddev;
+
+        mutex_lock(&ddev->mode_config.mutex);
+        drm_connector_unplug_all(ddev);
+        mutex_unlock(&ddev->mode_config.mutex);
+
+        drm_dev_unregister(ddev);
+
+        if (rcdu->fbdev)
+                drm_fbdev_cma_fini(rcdu->fbdev);
+
+        drm_kms_helper_poll_fini(ddev);
+        drm_mode_config_cleanup(ddev);
+        drm_vblank_cleanup(ddev);
+
+        drm_dev_unref(ddev);
+
+        return 0;
 }
 
-static int rcar_du_remove(struct platform_device *pdev)
+static int rcar_du_probe(struct platform_device *pdev)
 {
-        struct rcar_du_device *rcdu = platform_get_drvdata(pdev);
+        struct device_node *np = pdev->dev.of_node;
+        struct rcar_du_device *rcdu;
+        struct drm_connector *connector;
+        struct drm_device *ddev;
+        struct resource *mem;
+        int ret;
 
-        drm_put_dev(rcdu->ddev);
+        if (np == NULL) {
+                dev_err(&pdev->dev, "no device tree node\n");
+                return -ENODEV;
+        }
+
+        /* Allocate and initialize the DRM and R-Car device structures. */
+        rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL);
+        if (rcdu == NULL)
+                return -ENOMEM;
+
+        init_waitqueue_head(&rcdu->commit.wait);
+
+        rcdu->dev = &pdev->dev;
+        rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data;
+
+        ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev);
+        if (!ddev)
+                return -ENOMEM;
+
+        drm_dev_set_unique(ddev, dev_name(&pdev->dev));
+
+        rcdu->ddev = ddev;
+        ddev->dev_private = rcdu;
+
+        platform_set_drvdata(pdev, rcdu);
+
+        /* I/O resources */
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(rcdu->mmio)) {
+                ret = PTR_ERR(rcdu->mmio);
+                goto error;
+        }
+
+        /* Initialize vertical blanking interrupts handling. Start with vblank
+         * disabled for all CRTCs.
+         */
+        ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to initialize vblank\n");
+                goto error;
+        }
+
+        /* DRM/KMS objects */
+        ret = rcar_du_modeset_init(rcdu);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret);
+                goto error;
+        }
+
+        ddev->irq_enabled = 1;
+
+        /* Register the DRM device with the core and the connectors with
+         * sysfs.
+         */
+        ret = drm_dev_register(ddev, 0);
+        if (ret)
+                goto error;
+
+        mutex_lock(&ddev->mode_config.mutex);
+        drm_for_each_connector(connector, ddev) {
+                ret = drm_connector_register(connector);
+                if (ret < 0)
+                        break;
+        }
+        mutex_unlock(&ddev->mode_config.mutex);
+
+        if (ret < 0)
+                goto error;
+
+        DRM_INFO("Device %s probed\n", dev_name(&pdev->dev));
 
         return 0;
+
+error:
+        rcar_du_remove(pdev);
+
+        return ret;
 }
 
 static struct platform_driver rcar_du_platform_driver = {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index 9f34fc86436a..ed35467d96cf 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -1,7 +1,7 @@
 /*
  * rcar_du_drv.h  --  R-Car Display Unit DRM driver
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -19,6 +19,7 @@
 
 #include "rcar_du_crtc.h"
 #include "rcar_du_group.h"
+#include "rcar_du_vsp.h"
 
 struct clk;
 struct device;
@@ -29,6 +30,7 @@ struct rcar_du_lvdsenc;
 
 #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK  (1 << 0)        /* Per-CRTC IRQ and clock */
 #define RCAR_DU_FEATURE_EXT_CTRL_REGS   (1 << 1)        /* Has extended control registers */
+#define RCAR_DU_FEATURE_VSP1_SOURCE     (1 << 2)        /* Has inputs from VSP1 */
 
 #define RCAR_DU_QUIRK_ALIGN_128B        (1 << 0)        /* Align pitches to 128 bytes */
 #define RCAR_DU_QUIRK_LVDS_LANES        (1 << 1)        /* LVDS lanes 1 and 3 inverted */
@@ -51,6 +53,7 @@ struct rcar_du_output_routing {
 
 /*
  * struct rcar_du_device_info - DU model-specific information
+ * @gen: device generation (2 or 3)
  * @features: device features (RCAR_DU_FEATURE_*)
  * @quirks: device quirks (RCAR_DU_QUIRK_*)
  * @num_crtcs: total number of CRTCs
@@ -58,6 +61,7 @@ struct rcar_du_output_routing {
  * @num_lvds: number of internal LVDS encoders
  */
 struct rcar_du_device_info {
+        unsigned int gen;
         unsigned int features;
         unsigned int quirks;
         unsigned int num_crtcs;
@@ -65,9 +69,10 @@ struct rcar_du_device_info {
         unsigned int num_lvds;
 };
 
-#define RCAR_DU_MAX_CRTCS               3
+#define RCAR_DU_MAX_CRTCS               4
 #define RCAR_DU_MAX_GROUPS              DIV_ROUND_UP(RCAR_DU_MAX_CRTCS, 2)
 #define RCAR_DU_MAX_LVDS                2
+#define RCAR_DU_MAX_VSPS                4
 
 struct rcar_du_device {
         struct device *dev;
@@ -82,6 +87,7 @@ struct rcar_du_device {
         unsigned int num_crtcs;
 
         struct rcar_du_group groups[RCAR_DU_MAX_GROUPS];
+        struct rcar_du_vsp vsps[RCAR_DU_MAX_VSPS];
 
         struct {
                 struct drm_property *alpha;
@@ -90,6 +96,8 @@ struct rcar_du_device {
         } props;
 
         unsigned int dpad0_source;
+        unsigned int vspd1_sink;
+
         struct rcar_du_lvdsenc *lvds[RCAR_DU_MAX_LVDS];
 
         struct {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index c08700757feb..4e939e41f030 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -89,12 +89,8 @@ static int rcar_du_encoder_atomic_check(struct drm_encoder *encoder,
         /* The flat panel mode is fixed, just copy it to the adjusted mode. */
         drm_mode_copy(adjusted_mode, panel_mode);
 
-        /* The internal LVDS encoder has a clock frequency operating range of
-         * 30MHz to 150MHz. Clamp the clock accordingly.
-         */
         if (renc->lvds)
-                adjusted_mode->clock = clamp(adjusted_mode->clock,
-                                             30000, 150000);
+                rcar_du_lvdsenc_atomic_check(renc->lvds, adjusted_mode);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c
index 8e2ffe025153..33b2fc53da3e 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_group.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c
@@ -1,7 +1,7 @@
 /*
  * rcar_du_group.c  --  R-Car Display Unit Channels Pair
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -44,29 +44,64 @@ void rcar_du_group_write(struct rcar_du_group *rgrp, u32 reg, u32 data)
         rcar_du_write(rgrp->dev, rgrp->mmio_offset + reg, data);
 }
 
+static void rcar_du_group_setup_pins(struct rcar_du_group *rgrp)
+{
+        u32 defr6 = DEFR6_CODE | DEFR6_ODPM12_DISP;
+
+        if (rgrp->num_crtcs > 1)
+                defr6 |= DEFR6_ODPM22_DISP;
+
+        rcar_du_group_write(rgrp, DEFR6, defr6);
+}
+
 static void rcar_du_group_setup_defr8(struct rcar_du_group *rgrp)
 {
-        u32 defr8 = DEFR8_CODE | DEFR8_DEFE8;
+        struct rcar_du_device *rcdu = rgrp->dev;
+        unsigned int possible_crtcs =
+                rcdu->info->routes[RCAR_DU_OUTPUT_DPAD0].possible_crtcs;
+        u32 defr8 = DEFR8_CODE;
 
-        /* The DEFR8 register for the first group also controls RGB output
-         * routing to DPAD0 for DU instances that support it.
-         */
-        if (rgrp->dev->info->routes[RCAR_DU_OUTPUT_DPAD0].possible_crtcs > 1 &&
-            rgrp->index == 0)
-                defr8 |= DEFR8_DRGBS_DU(rgrp->dev->dpad0_source);
+        if (rcdu->info->gen < 3) {
+                defr8 |= DEFR8_DEFE8;
+
+                /* On Gen2 the DEFR8 register for the first group also controls
+                 * RGB output routing to DPAD0 and VSPD1 routing to DU0/1/2 for
+                 * DU instances that support it.
+                 */
+                if (rgrp->index == 0) {
+                        if (possible_crtcs > 1)
+                                defr8 |= DEFR8_DRGBS_DU(rcdu->dpad0_source);
+                        if (rgrp->dev->vspd1_sink == 2)
+                                defr8 |= DEFR8_VSCS;
+                }
+        } else {
+                /* On Gen3 VSPD routing can't be configured, but DPAD routing
+                 * needs to be set despite having a single option available.
+                 */
+                u32 crtc = ffs(possible_crtcs) - 1;
+
+                if (crtc / 2 == rgrp->index)
+                        defr8 |= DEFR8_DRGBS_DU(crtc);
+        }
 
         rcar_du_group_write(rgrp, DEFR8, defr8);
 }
 
 static void rcar_du_group_setup(struct rcar_du_group *rgrp)
 {
+        struct rcar_du_device *rcdu = rgrp->dev;
+
         /* Enable extended features */
         rcar_du_group_write(rgrp, DEFR, DEFR_CODE | DEFR_DEFE);
-        rcar_du_group_write(rgrp, DEFR2, DEFR2_CODE | DEFR2_DEFE2G);
-        rcar_du_group_write(rgrp, DEFR3, DEFR3_CODE | DEFR3_DEFE3);
-        rcar_du_group_write(rgrp, DEFR4, DEFR4_CODE);
+        if (rcdu->info->gen < 3) {
+                rcar_du_group_write(rgrp, DEFR2, DEFR2_CODE | DEFR2_DEFE2G);
+                rcar_du_group_write(rgrp, DEFR3, DEFR3_CODE | DEFR3_DEFE3);
+                rcar_du_group_write(rgrp, DEFR4, DEFR4_CODE);
+        }
         rcar_du_group_write(rgrp, DEFR5, DEFR5_CODE | DEFR5_DEFE5);
 
+        rcar_du_group_setup_pins(rgrp);
+
         if (rcar_du_has(rgrp->dev, RCAR_DU_FEATURE_EXT_CTRL_REGS)) {
                 rcar_du_group_setup_defr8(rgrp);
 
@@ -82,6 +117,9 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp)
                                     DIDSR_PDCS_CLK(0, 0));
         }
 
+        if (rcdu->info->gen >= 3)
+                rcar_du_group_write(rgrp, DEFR10, DEFR10_CODE | DEFR10_DEFE10);
+
         /* Use DS1PR and DS2PR to configure planes priorities and connects the
          * superposition 0 to DU0 pins. DU1 pins will be configured dynamically.
          */
@@ -158,21 +196,23 @@ void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start)
 
 void rcar_du_group_restart(struct rcar_du_group *rgrp)
 {
+        rgrp->need_restart = false;
+
         __rcar_du_group_start_stop(rgrp, false);
         __rcar_du_group_start_stop(rgrp, true);
 }
 
-static int rcar_du_set_dpad0_routing(struct rcar_du_device *rcdu)
+int rcar_du_set_dpad0_vsp1_routing(struct rcar_du_device *rcdu)
 {
         int ret;
 
         if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_EXT_CTRL_REGS))
                 return 0;
 
-        /* RGB output routing to DPAD0 is configured in the DEFR8 register of
-         * the first group. As this function can be called with the DU0 and DU1
-         * CRTCs disabled, we need to enable the first group clock before
-         * accessing the register.
+        /* RGB output routing to DPAD0 and VSP1D routing to DU0/1/2 are
+         * configured in the DEFR8 register of the first group. As this function
+         * can be called with the DU0 and DU1 CRTCs disabled, we need to enable
+         * the first group clock before accessing the register.
          */
         ret = clk_prepare_enable(rcdu->crtcs[0].clock);
         if (ret < 0)
@@ -203,5 +243,5 @@ int rcar_du_group_set_routing(struct rcar_du_group *rgrp)
 
         rcar_du_group_write(rgrp, DORCR, dorcr);
 
-        return rcar_du_set_dpad0_routing(rgrp->dev);
+        return rcar_du_set_dpad0_vsp1_routing(rgrp->dev);
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h
index d7318e1a6b00..5e3adc6b31b5 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_group.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h
@@ -32,6 +32,7 @@ struct rcar_du_device;
  * @dptsr_planes: bitmask of planes driven by dot-clock and timing generator 1
  * @num_planes: number of planes in the group
  * @planes: planes handled by the group
+ * @need_restart: the group needs to be restarted due to a configuration change
  */
 struct rcar_du_group {
         struct rcar_du_device *dev;
@@ -47,6 +48,7 @@ struct rcar_du_group {
 
         unsigned int num_planes;
         struct rcar_du_plane planes[RCAR_DU_NUM_KMS_PLANES];
+        bool need_restart;
 };
 
 u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg);
@@ -58,4 +60,6 @@ void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start);
 void rcar_du_group_restart(struct rcar_du_group *rgrp);
 int rcar_du_group_set_routing(struct rcar_du_group *rgrp);
 
+int rcar_du_set_dpad0_vsp1_routing(struct rcar_du_device *rcdu);
+
 #endif /* __RCAR_DU_GROUP_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
index a37b6e2fe51a..6c927144b5c9 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
@@ -55,12 +55,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .best_encoder = rcar_du_connector_best_encoder,
 };
 
-static void rcar_du_hdmi_connector_destroy(struct drm_connector *connector)
-{
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-}
-
 static enum drm_connector_status
 rcar_du_hdmi_connector_detect(struct drm_connector *connector, bool force)
 {
@@ -79,7 +73,7 @@ static const struct drm_connector_funcs connector_funcs = {
         .reset = drm_atomic_helper_connector_reset,
         .detect = rcar_du_hdmi_connector_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = rcar_du_hdmi_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
@@ -108,9 +102,6 @@ int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_connector_register(connector);
-        if (ret < 0)
-                return ret;
 
         connector->dpms = DRM_MODE_DPMS_OFF;
         drm_object_property_set_value(&connector->base,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
index 2567efcbee36..461662d231e2 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
@@ -71,12 +71,9 @@ static int rcar_du_hdmienc_atomic_check(struct drm_encoder *encoder,
         struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
         const struct drm_display_mode *mode = &crtc_state->mode;
 
-        /* The internal LVDS encoder has a clock frequency operating range of
-         * 30MHz to 150MHz. Clamp the clock accordingly.
-         */
         if (hdmienc->renc->lvds)
-                adjusted_mode->clock = clamp(adjusted_mode->clock,
-                                             30000, 150000);
+                rcar_du_lvdsenc_atomic_check(hdmienc->renc->lvds,
+                                             adjusted_mode);
 
         if (sfuncs->mode_fixup == NULL)
                 return 0;
@@ -134,12 +131,19 @@ int rcar_du_hdmienc_init(struct rcar_du_device *rcdu,
 
         /* Locate the slave I2C device and driver. */
         i2c_slave = of_find_i2c_device_by_node(np);
-        if (!i2c_slave || !i2c_get_clientdata(i2c_slave))
+        if (!i2c_slave || !i2c_get_clientdata(i2c_slave)) {
+                dev_dbg(rcdu->dev,
+                        "can't get I2C slave for %s, deferring probe\n",
+                        of_node_full_name(np));
                 return -EPROBE_DEFER;
+        }
 
         hdmienc->dev = &i2c_slave->dev;
 
         if (hdmienc->dev->driver == NULL) {
+                dev_dbg(rcdu->dev,
+                        "I2C slave %s not probed yet, deferring probe\n",
+                        dev_name(hdmienc->dev));
                 ret = -EPROBE_DEFER;
                 goto error;
         }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 43bce69d8560..24725bf859b4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -1,7 +1,7 @@
 /*
  * rcar_du_kms.c  --  R-Car Display Unit Mode Setting
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -28,6 +28,7 @@
 #include "rcar_du_kms.h"
 #include "rcar_du_lvdsenc.h"
 #include "rcar_du_regs.h"
+#include "rcar_du_vsp.h"
 
 /* -----------------------------------------------------------------------------
  * Format helpers
@@ -89,13 +90,44 @@ static const struct rcar_du_format_info rcar_du_format_infos[] = {
                 .pnmr = PnMR_SPIM_TP_OFF | PnMR_DDDF_YC,
                 .edf = PnDDCR4_EDF_NONE,
         }, {
-                /* In YUV 4:2:2, only NV16 is supported (NV61 isn't) */
                 .fourcc = DRM_FORMAT_NV16,
                 .bpp = 16,
                 .planes = 2,
                 .pnmr = PnMR_SPIM_TP_OFF | PnMR_DDDF_YC,
                 .edf = PnDDCR4_EDF_NONE,
         },
+        /* The following formats are not supported on Gen2 and thus have no
+         * associated .pnmr or .edf settings.
+         */
+        {
+                .fourcc = DRM_FORMAT_NV61,
+                .bpp = 16,
+                .planes = 2,
+        }, {
+                .fourcc = DRM_FORMAT_YUV420,
+                .bpp = 12,
+                .planes = 3,
+        }, {
+                .fourcc = DRM_FORMAT_YVU420,
+                .bpp = 12,
+                .planes = 3,
+        }, {
+                .fourcc = DRM_FORMAT_YUV422,
+                .bpp = 16,
+                .planes = 3,
+        }, {
+                .fourcc = DRM_FORMAT_YVU422,
+                .bpp = 16,
+                .planes = 3,
+        }, {
+                .fourcc = DRM_FORMAT_YUV444,
+                .bpp = 24,
+                .planes = 3,
+        }, {
+                .fourcc = DRM_FORMAT_YVU444,
+                .bpp = 24,
+                .planes = 3,
+        },
 };
 
 const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc)
@@ -143,6 +175,7 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
         unsigned int max_pitch;
         unsigned int align;
         unsigned int bpp;
+        unsigned int i;
 
         format = rcar_du_format_info(mode_cmd->pixel_format);
         if (format == NULL) {
@@ -155,7 +188,7 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
          * The pitch and alignment constraints are expressed in pixels on the
          * hardware side and in bytes in the DRM API.
          */
-        bpp = format->planes == 2 ? 1 : format->bpp / 8;
+        bpp = format->planes == 1 ? format->bpp / 8 : 1;
         max_pitch =  4096 * bpp;
 
         if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))
@@ -170,8 +203,8 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                 return ERR_PTR(-EINVAL);
         }
 
-        if (format->planes == 2) {
-                if (mode_cmd->pitches[1] != mode_cmd->pitches[0]) {
+        for (i = 1; i < format->planes; ++i) {
+                if (mode_cmd->pitches[i] != mode_cmd->pitches[0]) {
                         dev_dbg(dev->dev,
                                 "luma and chroma pitches do not match\n");
                         return ERR_PTR(-EINVAL);
@@ -192,252 +225,20 @@ static void rcar_du_output_poll_changed(struct drm_device *dev)
  * Atomic Check and Update
  */
 
-/*
- * Atomic hardware plane allocator
- *
- * The hardware plane allocator is solely based on the atomic plane states
- * without keeping any external state to avoid races between .atomic_check()
- * and .atomic_commit().
- *
- * The core idea is to avoid using a free planes bitmask that would need to be
- * shared between check and commit handlers with a collective knowledge based on
- * the allocated hardware plane(s) for each KMS plane. The allocator then loops
- * over all plane states to compute the free planes bitmask, allocates hardware
- * planes based on that bitmask, and stores the result back in the plane states.
- *
- * For this to work we need to access the current state of planes not touched by
- * the atomic update. To ensure that it won't be modified, we need to lock all
- * planes using drm_atomic_get_plane_state(). This effectively serializes atomic
- * updates from .atomic_check() up to completion (when swapping the states if
- * the check step has succeeded) or rollback (when freeing the states if the
- * check step has failed).
- *
- * Allocation is performed in the .atomic_check() handler and applied
- * automatically when the core swaps the old and new states.
- */
-
-static bool rcar_du_plane_needs_realloc(struct rcar_du_plane *plane,
-                                        struct rcar_du_plane_state *state)
-{
-        const struct rcar_du_format_info *cur_format;
-
-        cur_format = to_rcar_plane_state(plane->plane.state)->format;
-
-        /* Lowering the number of planes doesn't strictly require reallocation
-         * as the extra hardware plane will be freed when committing, but doing
-         * so could lead to more fragmentation.
-         */
-        return !cur_format || cur_format->planes != state->format->planes;
-}
-
-static unsigned int rcar_du_plane_hwmask(struct rcar_du_plane_state *state)
-{
-        unsigned int mask;
-
-        if (state->hwindex == -1)
-                return 0;
-
-        mask = 1 << state->hwindex;
-        if (state->format->planes == 2)
-                mask |= 1 << ((state->hwindex + 1) % 8);
-
-        return mask;
-}
-
-static int rcar_du_plane_hwalloc(unsigned int num_planes, unsigned int free)
-{
-        unsigned int i;
-
-        for (i = 0; i < RCAR_DU_NUM_HW_PLANES; ++i) {
-                if (!(free & (1 << i)))
-                        continue;
-
-                if (num_planes == 1 || free & (1 << ((i + 1) % 8)))
-                        break;
-        }
-
-        return i == RCAR_DU_NUM_HW_PLANES ? -EBUSY : i;
-}
-
 static int rcar_du_atomic_check(struct drm_device *dev,
                                 struct drm_atomic_state *state)
 {
         struct rcar_du_device *rcdu = dev->dev_private;
-        unsigned int group_freed_planes[RCAR_DU_MAX_GROUPS] = { 0, };
-        unsigned int group_free_planes[RCAR_DU_MAX_GROUPS] = { 0, };
-        bool needs_realloc = false;
-        unsigned int groups = 0;
-        unsigned int i;
         int ret;
 
         ret = drm_atomic_helper_check(dev, state);
         if (ret < 0)
                 return ret;
 
-        /* Check if hardware planes need to be reallocated. */
-        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
-                struct rcar_du_plane_state *plane_state;
-                struct rcar_du_plane *plane;
-                unsigned int index;
-
-                if (!state->planes[i])
-                        continue;
-
-                plane = to_rcar_plane(state->planes[i]);
-                plane_state = to_rcar_plane_state(state->plane_states[i]);
-
-                dev_dbg(rcdu->dev, "%s: checking plane (%u,%u)\n", __func__,
-                        plane->group->index, plane - plane->group->planes);
-
-                /* If the plane is being disabled we don't need to go through
-                 * the full reallocation procedure. Just mark the hardware
-                 * plane(s) as freed.
-                 */
-                if (!plane_state->format) {
-                        dev_dbg(rcdu->dev, "%s: plane is being disabled\n",
-                                __func__);
-                        index = plane - plane->group->planes;
-                        group_freed_planes[plane->group->index] |= 1 << index;
-                        plane_state->hwindex = -1;
-                        continue;
-                }
-
-                /* If the plane needs to be reallocated mark it as such, and
-                 * mark the hardware plane(s) as free.
-                 */
-                if (rcar_du_plane_needs_realloc(plane, plane_state)) {
-                        dev_dbg(rcdu->dev, "%s: plane needs reallocation\n",
-                                __func__);
-                        groups |= 1 << plane->group->index;
-                        needs_realloc = true;
-
-                        index = plane - plane->group->planes;
-                        group_freed_planes[plane->group->index] |= 1 << index;
-                        plane_state->hwindex = -1;
-                }
-        }
-
-        if (!needs_realloc)
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
                 return 0;
 
-        /* Grab all plane states for the groups that need reallocation to ensure
-         * locking and avoid racy updates. This serializes the update operation,
-         * but there's not much we can do about it as that's the hardware
-         * design.
-         *
-         * Compute the used planes mask for each group at the same time to avoid
-         * looping over the planes separately later.
-         */
-        while (groups) {
-                unsigned int index = ffs(groups) - 1;
-                struct rcar_du_group *group = &rcdu->groups[index];
-                unsigned int used_planes = 0;
-
-                dev_dbg(rcdu->dev, "%s: finding free planes for group %u\n",
-                        __func__, index);
-
-                for (i = 0; i < group->num_planes; ++i) {
-                        struct rcar_du_plane *plane = &group->planes[i];
-                        struct rcar_du_plane_state *plane_state;
-                        struct drm_plane_state *s;
-
-                        s = drm_atomic_get_plane_state(state, &plane->plane);
-                        if (IS_ERR(s))
-                                return PTR_ERR(s);
-
-                        /* If the plane has been freed in the above loop its
-                         * hardware planes must not be added to the used planes
-                         * bitmask. However, the current state doesn't reflect
-                         * the free state yet, as we've modified the new state
-                         * above. Use the local freed planes list to check for
-                         * that condition instead.
-                         */
-                        if (group_freed_planes[index] & (1 << i)) {
-                                dev_dbg(rcdu->dev,
-                                        "%s: plane (%u,%u) has been freed, skipping\n",
-                                        __func__, plane->group->index,
-                                        plane - plane->group->planes);
-                                continue;
-                        }
-
-                        plane_state = to_rcar_plane_state(plane->plane.state);
-                        used_planes |= rcar_du_plane_hwmask(plane_state);
-
-                        dev_dbg(rcdu->dev,
-                                "%s: plane (%u,%u) uses %u hwplanes (index %d)\n",
-                                __func__, plane->group->index,
-                                plane - plane->group->planes,
-                                plane_state->format ?
-                                plane_state->format->planes : 0,
-                                plane_state->hwindex);
-                }
-
-                group_free_planes[index] = 0xff & ~used_planes;
-                groups &= ~(1 << index);
-
-                dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
-                        __func__, index, group_free_planes[index]);
-        }
-
-        /* Reallocate hardware planes for each plane that needs it. */
-        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
-                struct rcar_du_plane_state *plane_state;
-                struct rcar_du_plane *plane;
-                unsigned int crtc_planes;
-                unsigned int free;
-                int idx;
-
-                if (!state->planes[i])
-                        continue;
-
-                plane = to_rcar_plane(state->planes[i]);
-                plane_state = to_rcar_plane_state(state->plane_states[i]);
-
-                dev_dbg(rcdu->dev, "%s: allocating plane (%u,%u)\n", __func__,
-                        plane->group->index, plane - plane->group->planes);
-
-                /* Skip planes that are being disabled or don't need to be
-                 * reallocated.
-                 */
-                if (!plane_state->format ||
-                    !rcar_du_plane_needs_realloc(plane, plane_state))
-                        continue;
-
-                /* Try to allocate the plane from the free planes currently
-                 * associated with the target CRTC to avoid restarting the CRTC
-                 * group and thus minimize flicker. If it fails fall back to
-                 * allocating from all free planes.
-                 */
-                crtc_planes = to_rcar_crtc(plane_state->state.crtc)->index % 2
-                            ? plane->group->dptsr_planes
-                            : ~plane->group->dptsr_planes;
-                free = group_free_planes[plane->group->index];
-
-                idx = rcar_du_plane_hwalloc(plane_state->format->planes,
-                                            free & crtc_planes);
-                if (idx < 0)
-                        idx = rcar_du_plane_hwalloc(plane_state->format->planes,
-                                                    free);
-                if (idx < 0) {
-                        dev_dbg(rcdu->dev, "%s: no available hardware plane\n",
-                                __func__);
-                        return idx;
-                }
-
-                dev_dbg(rcdu->dev, "%s: allocated %u hwplanes (index %u)\n",
-                        __func__, plane_state->format->planes, idx);
-
-                plane_state->hwindex = idx;
-
-                group_free_planes[plane->group->index] &=
-                        ~rcar_du_plane_hwmask(plane_state);
-
-                dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
-                        __func__, plane->group->index,
-                        group_free_planes[plane->group->index]);
-        }
-
-        return 0;
+        return rcar_du_atomic_check_planes(dev, state);
 }
 
 struct rcar_du_commit {
@@ -456,7 +257,7 @@ static void rcar_du_atomic_complete(struct rcar_du_commit *commit)
         /* Apply the atomic update. */
         drm_atomic_helper_commit_modeset_disables(dev, old_state);
         drm_atomic_helper_commit_modeset_enables(dev, old_state);
-        drm_atomic_helper_commit_planes(dev, old_state, false);
+        drm_atomic_helper_commit_planes(dev, old_state, true);
 
         drm_atomic_helper_wait_for_vblanks(dev, old_state);
 
@@ -775,14 +576,34 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
                 rgrp->num_crtcs = min(rcdu->num_crtcs - 2 * i, 2U);
 
                 /* If we have more than one CRTCs in this group pre-associate
-                 * planes 0-3 with CRTC 0 and planes 4-7 with CRTC 1 to minimize
-                 * flicker occurring when the association is changed.
+                 * the low-order planes with CRTC 0 and the high-order planes
+                 * with CRTC 1 to minimize flicker occurring when the
+                 * association is changed.
                  */
-                rgrp->dptsr_planes = rgrp->num_crtcs > 1 ? 0xf0 : 0;
+                rgrp->dptsr_planes = rgrp->num_crtcs > 1
+                                   ? (rcdu->info->gen >= 3 ? 0x04 : 0xf0)
+                                   : 0;
 
-                ret = rcar_du_planes_init(rgrp);
-                if (ret < 0)
-                        return ret;
+                if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE)) {
+                        ret = rcar_du_planes_init(rgrp);
+                        if (ret < 0)
+                                return ret;
+                }
+        }
+
+        /* Initialize the compositors. */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE)) {
+                for (i = 0; i < rcdu->num_crtcs; ++i) {
+                        struct rcar_du_vsp *vsp = &rcdu->vsps[i];
+
+                        vsp->index = i;
+                        vsp->dev = rcdu;
+                        rcdu->crtcs[i].vsp = vsp;
+
+                        ret = rcar_du_vsp_init(vsp);
+                        if (ret < 0)
+                                return ret;
+                }
         }
 
         /* Create the CRTCs. */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index 0c43032fc693..e905f5da7aaa 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -62,12 +62,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .best_encoder = rcar_du_connector_best_encoder,
 };
 
-static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
-{
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-}
-
 static enum drm_connector_status
 rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force)
 {
@@ -79,7 +73,7 @@ static const struct drm_connector_funcs connector_funcs = {
         .reset = drm_atomic_helper_connector_reset,
         .detect = rcar_du_lvds_connector_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = rcar_du_lvds_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
@@ -117,9 +111,6 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_connector_register(connector);
-        if (ret < 0)
-                return ret;
 
         connector->dpms = DRM_MODE_DPMS_OFF;
         drm_object_property_set_value(&connector->base,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
index 85043c5bad03..ef3a50321ecc 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
@@ -38,35 +38,106 @@ static void rcar_lvds_write(struct rcar_du_lvdsenc *lvds, u32 reg, u32 data)
         iowrite32(data, lvds->mmio + reg);
 }
 
-static int rcar_du_lvdsenc_start(struct rcar_du_lvdsenc *lvds,
-                                 struct rcar_du_crtc *rcrtc)
+static void rcar_du_lvdsenc_start_gen2(struct rcar_du_lvdsenc *lvds,
+                                       struct rcar_du_crtc *rcrtc)
 {
         const struct drm_display_mode *mode = &rcrtc->crtc.mode;
         unsigned int freq = mode->clock;
         u32 lvdcr0;
-        u32 lvdhcr;
         u32 pllcr;
-        int ret;
-
-        if (lvds->enabled)
-                return 0;
-
-        ret = clk_prepare_enable(lvds->clock);
-        if (ret < 0)
-                return ret;
 
         /* PLL clock configuration */
-        if (freq <= 38000)
+        if (freq < 39000)
                 pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_38M;
-        else if (freq <= 60000)
+        else if (freq < 61000)
                 pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_60M;
-        else if (freq <= 121000)
+        else if (freq < 121000)
                 pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_121M;
         else
                 pllcr = LVDPLLCR_PLLDLYCNT_150M;
 
         rcar_lvds_write(lvds, LVDPLLCR, pllcr);
 
+        /* Select the input, hardcode mode 0, enable LVDS operation and turn
+         * bias circuitry on.
+         */
+        lvdcr0 = LVDCR0_BEN | LVDCR0_LVEN;
+        if (rcrtc->index == 2)
+                lvdcr0 |= LVDCR0_DUSEL;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        /* Turn all the channels on. */
+        rcar_lvds_write(lvds, LVDCR1,
+                        LVDCR1_CHSTBY_GEN2(3) | LVDCR1_CHSTBY_GEN2(2) |
+                        LVDCR1_CHSTBY_GEN2(1) | LVDCR1_CHSTBY_GEN2(0) |
+                        LVDCR1_CLKSTBY_GEN2);
+
+        /* Turn the PLL on, wait for the startup delay, and turn the output
+         * on.
+         */
+        lvdcr0 |= LVDCR0_PLLON;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        usleep_range(100, 150);
+
+        lvdcr0 |= LVDCR0_LVRES;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+}
+
+static void rcar_du_lvdsenc_start_gen3(struct rcar_du_lvdsenc *lvds,
+                                       struct rcar_du_crtc *rcrtc)
+{
+        const struct drm_display_mode *mode = &rcrtc->crtc.mode;
+        unsigned int freq = mode->clock;
+        u32 lvdcr0;
+        u32 pllcr;
+
+        /* PLL clock configuration */
+        if (freq < 42000)
+                pllcr = LVDPLLCR_PLLDIVCNT_42M;
+        else if (freq < 85000)
+                pllcr = LVDPLLCR_PLLDIVCNT_85M;
+        else if (freq < 128000)
+                pllcr = LVDPLLCR_PLLDIVCNT_128M;
+        else
+                pllcr = LVDPLLCR_PLLDIVCNT_148M;
+
+        rcar_lvds_write(lvds, LVDPLLCR, pllcr);
+
+        /* Turn the PLL on, set it to LVDS normal mode, wait for the startup
+         * delay and turn the output on.
+         */
+        lvdcr0 = LVDCR0_PLLON;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        lvdcr0 |= LVDCR0_PWD;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        usleep_range(100, 150);
+
+        lvdcr0 |= LVDCR0_LVRES;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        /* Turn all the channels on. */
+        rcar_lvds_write(lvds, LVDCR1,
+                        LVDCR1_CHSTBY_GEN3(3) | LVDCR1_CHSTBY_GEN3(2) |
+                        LVDCR1_CHSTBY_GEN3(1) | LVDCR1_CHSTBY_GEN3(0) |
+                        LVDCR1_CLKSTBY_GEN3);
+}
+
+static int rcar_du_lvdsenc_start(struct rcar_du_lvdsenc *lvds,
+                                 struct rcar_du_crtc *rcrtc)
+{
+        u32 lvdhcr;
+        int ret;
+
+        if (lvds->enabled)
+                return 0;
+
+        ret = clk_prepare_enable(lvds->clock);
+        if (ret < 0)
+                return ret;
+
         /* Hardcode the channels and control signals routing for now.
          *
          * HSYNC -> CTRL0
@@ -87,30 +158,14 @@ static int rcar_du_lvdsenc_start(struct rcar_du_lvdsenc *lvds,
 
         rcar_lvds_write(lvds, LVDCHCR, lvdhcr);
 
-        /* Select the input, hardcode mode 0, enable LVDS operation and turn
-         * bias circuitry on.
-         */
-        lvdcr0 = LVDCR0_BEN | LVDCR0_LVEN;
-        if (rcrtc->index == 2)
-                lvdcr0 |= LVDCR0_DUSEL;
-        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
-        /* Turn all the channels on. */
-        rcar_lvds_write(lvds, LVDCR1, LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
-                        LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
-
-        /* Turn the PLL on, wait for the startup delay, and turn the output
-         * on.
-         */
-        lvdcr0 |= LVDCR0_PLLEN;
-        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
-        usleep_range(100, 150);
-
-        lvdcr0 |= LVDCR0_LVRES;
-        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+        /* Perform generation-specific initialization. */
+        if (lvds->dev->info->gen < 3)
+                rcar_du_lvdsenc_start_gen2(lvds, rcrtc);
+        else
+                rcar_du_lvdsenc_start_gen3(lvds, rcrtc);
 
         lvds->enabled = true;
+
         return 0;
 }
 
@@ -140,6 +195,21 @@ int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds, struct drm_crtc *crtc,
                 return -EINVAL;
 }
 
+void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
+                                  struct drm_display_mode *mode)
+{
+        struct rcar_du_device *rcdu = lvds->dev;
+
+        /* The internal LVDS encoder has a restricted clock frequency operating
+         * range (30MHz to 150MHz on Gen2, 25.175MHz to 148.5MHz on Gen3). Clamp
+         * the clock accordingly.
+         */
+        if (rcdu->info->gen < 3)
+                mode->clock = clamp(mode->clock, 30000, 150000);
+        else
+                mode->clock = clamp(mode->clock, 25175, 148500);
+}
+
 static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds,
                                          struct platform_device *pdev)
 {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
index 9a6001c07303..dfdba746edf4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
@@ -30,6 +30,8 @@ enum rcar_lvds_input {
 int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu);
 int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds,
                            struct drm_crtc *crtc, bool enable);
+void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
+                                  struct drm_display_mode *mode);
 #else
 static inline int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu)
 {
@@ -40,6 +42,10 @@ static inline int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds,
 {
         return 0;
 }
+static inline void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
+                                                struct drm_display_mode *mode)
+{
+}
 #endif
 
 #endif /* __RCAR_DU_LVDSENC_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index c3ed9522c0e1..8460ae1ffa4b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -1,7 +1,7 @@
 /*
  * rcar_du_plane.c  --  R-Car Display Unit Planes
  *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -12,6 +12,7 @@
  */
 
 #include <drm/drmP.h>
+#include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
@@ -20,21 +21,300 @@
 #include <drm/drm_plane_helper.h>
 
 #include "rcar_du_drv.h"
+#include "rcar_du_group.h"
 #include "rcar_du_kms.h"
 #include "rcar_du_plane.h"
 #include "rcar_du_regs.h"
 
-#define RCAR_DU_COLORKEY_NONE           (0 << 24)
-#define RCAR_DU_COLORKEY_SOURCE         (1 << 24)
-#define RCAR_DU_COLORKEY_MASK           (1 << 24)
+/* -----------------------------------------------------------------------------
+ * Atomic hardware plane allocator
+ *
+ * The hardware plane allocator is solely based on the atomic plane states
+ * without keeping any external state to avoid races between .atomic_check()
+ * and .atomic_commit().
+ *
+ * The core idea is to avoid using a free planes bitmask that would need to be
+ * shared between check and commit handlers with a collective knowledge based on
+ * the allocated hardware plane(s) for each KMS plane. The allocator then loops
+ * over all plane states to compute the free planes bitmask, allocates hardware
+ * planes based on that bitmask, and stores the result back in the plane states.
+ *
+ * For this to work we need to access the current state of planes not touched by
+ * the atomic update. To ensure that it won't be modified, we need to lock all
+ * planes using drm_atomic_get_plane_state(). This effectively serializes atomic
+ * updates from .atomic_check() up to completion (when swapping the states if
+ * the check step has succeeded) or rollback (when freeing the states if the
+ * check step has failed).
+ *
+ * Allocation is performed in the .atomic_check() handler and applied
+ * automatically when the core swaps the old and new states.
+ */
+
+static bool rcar_du_plane_needs_realloc(struct rcar_du_plane *plane,
+                                        struct rcar_du_plane_state *new_state)
+{
+        struct rcar_du_plane_state *cur_state;
+
+        cur_state = to_rcar_plane_state(plane->plane.state);
+
+        /* Lowering the number of planes doesn't strictly require reallocation
+         * as the extra hardware plane will be freed when committing, but doing
+         * so could lead to more fragmentation.
+         */
+        if (!cur_state->format ||
+            cur_state->format->planes != new_state->format->planes)
+                return true;
+
+        /* Reallocate hardware planes if the source has changed. */
+        if (cur_state->source != new_state->source)
+                return true;
 
-static u32 rcar_du_plane_read(struct rcar_du_group *rgrp,
-                              unsigned int index, u32 reg)
+        return false;
+}
+
+static unsigned int rcar_du_plane_hwmask(struct rcar_du_plane_state *state)
+{
+        unsigned int mask;
+
+        if (state->hwindex == -1)
+                return 0;
+
+        mask = 1 << state->hwindex;
+        if (state->format->planes == 2)
+                mask |= 1 << ((state->hwindex + 1) % 8);
+
+        return mask;
+}
+
+/*
+ * The R8A7790 DU can source frames directly from the VSP1 devices VSPD0 and
+ * VSPD1. VSPD0 feeds DU0/1 plane 0, and VSPD1 feeds either DU2 plane 0 or
+ * DU0/1 plane 1.
+ *
+ * Allocate the correct fixed plane when sourcing frames from VSPD0 or VSPD1,
+ * and allocate planes in reverse index order otherwise to ensure maximum
+ * availability of planes 0 and 1.
+ *
+ * The caller is responsible for ensuring that the requested source is
+ * compatible with the DU revision.
+ */
+static int rcar_du_plane_hwalloc(struct rcar_du_plane *plane,
+                                 struct rcar_du_plane_state *state,
+                                 unsigned int free)
 {
-        return rcar_du_read(rgrp->dev,
-                            rgrp->mmio_offset + index * PLANE_OFF + reg);
+        unsigned int num_planes = state->format->planes;
+        int fixed = -1;
+        int i;
+
+        if (state->source == RCAR_DU_PLANE_VSPD0) {
+                /* VSPD0 feeds plane 0 on DU0/1. */
+                if (plane->group->index != 0)
+                        return -EINVAL;
+
+                fixed = 0;
+        } else if (state->source == RCAR_DU_PLANE_VSPD1) {
+                /* VSPD1 feeds plane 1 on DU0/1 or plane 0 on DU2. */
+                fixed = plane->group->index == 0 ? 1 : 0;
+        }
+
+        if (fixed >= 0)
+                return free & (1 << fixed) ? fixed : -EBUSY;
+
+        for (i = RCAR_DU_NUM_HW_PLANES - 1; i >= 0; --i) {
+                if (!(free & (1 << i)))
+                        continue;
+
+                if (num_planes == 1 || free & (1 << ((i + 1) % 8)))
+                        break;
+        }
+
+        return i < 0 ? -EBUSY : i;
 }
 
+int rcar_du_atomic_check_planes(struct drm_device *dev,
+                                struct drm_atomic_state *state)
+{
+        struct rcar_du_device *rcdu = dev->dev_private;
+        unsigned int group_freed_planes[RCAR_DU_MAX_GROUPS] = { 0, };
+        unsigned int group_free_planes[RCAR_DU_MAX_GROUPS] = { 0, };
+        bool needs_realloc = false;
+        unsigned int groups = 0;
+        unsigned int i;
+
+        /* Check if hardware planes need to be reallocated. */
+        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
+                struct rcar_du_plane_state *plane_state;
+                struct rcar_du_plane *plane;
+                unsigned int index;
+
+                if (!state->planes[i])
+                        continue;
+
+                plane = to_rcar_plane(state->planes[i]);
+                plane_state = to_rcar_plane_state(state->plane_states[i]);
+
+                dev_dbg(rcdu->dev, "%s: checking plane (%u,%tu)\n", __func__,
+                        plane->group->index, plane - plane->group->planes);
+
+                /* If the plane is being disabled we don't need to go through
+                 * the full reallocation procedure. Just mark the hardware
+                 * plane(s) as freed.
+                 */
+                if (!plane_state->format) {
+                        dev_dbg(rcdu->dev, "%s: plane is being disabled\n",
+                                __func__);
+                        index = plane - plane->group->planes;
+                        group_freed_planes[plane->group->index] |= 1 << index;
+                        plane_state->hwindex = -1;
+                        continue;
+                }
+
+                /* If the plane needs to be reallocated mark it as such, and
+                 * mark the hardware plane(s) as free.
+                 */
+                if (rcar_du_plane_needs_realloc(plane, plane_state)) {
+                        dev_dbg(rcdu->dev, "%s: plane needs reallocation\n",
+                                __func__);
+                        groups |= 1 << plane->group->index;
+                        needs_realloc = true;
+
+                        index = plane - plane->group->planes;
+                        group_freed_planes[plane->group->index] |= 1 << index;
+                        plane_state->hwindex = -1;
+                }
+        }
+
+        if (!needs_realloc)
+                return 0;
+
+        /* Grab all plane states for the groups that need reallocation to ensure
+         * locking and avoid racy updates. This serializes the update operation,
+         * but there's not much we can do about it as that's the hardware
+         * design.
+         *
+         * Compute the used planes mask for each group at the same time to avoid
+         * looping over the planes separately later.
+         */
+        while (groups) {
+                unsigned int index = ffs(groups) - 1;
+                struct rcar_du_group *group = &rcdu->groups[index];
+                unsigned int used_planes = 0;
+
+                dev_dbg(rcdu->dev, "%s: finding free planes for group %u\n",
+                        __func__, index);
+
+                for (i = 0; i < group->num_planes; ++i) {
+                        struct rcar_du_plane *plane = &group->planes[i];
+                        struct rcar_du_plane_state *plane_state;
+                        struct drm_plane_state *s;
+
+                        s = drm_atomic_get_plane_state(state, &plane->plane);
+                        if (IS_ERR(s))
+                                return PTR_ERR(s);
+
+                        /* If the plane has been freed in the above loop its
+                         * hardware planes must not be added to the used planes
+                         * bitmask. However, the current state doesn't reflect
+                         * the free state yet, as we've modified the new state
+                         * above. Use the local freed planes list to check for
+                         * that condition instead.
+                         */
+                        if (group_freed_planes[index] & (1 << i)) {
+                                dev_dbg(rcdu->dev,
+                                        "%s: plane (%u,%tu) has been freed, skipping\n",
+                                        __func__, plane->group->index,
+                                        plane - plane->group->planes);
+                                continue;
+                        }
+
+                        plane_state = to_rcar_plane_state(plane->plane.state);
+                        used_planes |= rcar_du_plane_hwmask(plane_state);
+
+                        dev_dbg(rcdu->dev,
+                                "%s: plane (%u,%tu) uses %u hwplanes (index %d)\n",
+                                __func__, plane->group->index,
+                                plane - plane->group->planes,
+                                plane_state->format ?
+                                plane_state->format->planes : 0,
+                                plane_state->hwindex);
+                }
+
+                group_free_planes[index] = 0xff & ~used_planes;
+                groups &= ~(1 << index);
+
+                dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
+                        __func__, index, group_free_planes[index]);
+        }
+
+        /* Reallocate hardware planes for each plane that needs it. */
+        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
+                struct rcar_du_plane_state *plane_state;
+                struct rcar_du_plane *plane;
+                unsigned int crtc_planes;
+                unsigned int free;
+                int idx;
+
+                if (!state->planes[i])
+                        continue;
+
+                plane = to_rcar_plane(state->planes[i]);
+                plane_state = to_rcar_plane_state(state->plane_states[i]);
+
+                dev_dbg(rcdu->dev, "%s: allocating plane (%u,%tu)\n", __func__,
+                        plane->group->index, plane - plane->group->planes);
+
+                /* Skip planes that are being disabled or don't need to be
+                 * reallocated.
+                 */
+                if (!plane_state->format ||
+                    !rcar_du_plane_needs_realloc(plane, plane_state))
+                        continue;
+
+                /* Try to allocate the plane from the free planes currently
+                 * associated with the target CRTC to avoid restarting the CRTC
+                 * group and thus minimize flicker. If it fails fall back to
+                 * allocating from all free planes.
+                 */
+                crtc_planes = to_rcar_crtc(plane_state->state.crtc)->index % 2
+                            ? plane->group->dptsr_planes
+                            : ~plane->group->dptsr_planes;
+                free = group_free_planes[plane->group->index];
+
+                idx = rcar_du_plane_hwalloc(plane, plane_state,
+                                            free & crtc_planes);
+                if (idx < 0)
+                        idx = rcar_du_plane_hwalloc(plane, plane_state,
+                                                    free);
+                if (idx < 0) {
+                        dev_dbg(rcdu->dev, "%s: no available hardware plane\n",
+                                __func__);
+                        return idx;
+                }
+
+                dev_dbg(rcdu->dev, "%s: allocated %u hwplanes (index %u)\n",
+                        __func__, plane_state->format->planes, idx);
+
+                plane_state->hwindex = idx;
+
+                group_free_planes[plane->group->index] &=
+                        ~rcar_du_plane_hwmask(plane_state);
+
+                dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
+                        __func__, plane->group->index,
+                        group_free_planes[plane->group->index]);
+        }
+
+        return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Plane Setup
+ */
+
+#define RCAR_DU_COLORKEY_NONE           (0 << 24)
+#define RCAR_DU_COLORKEY_SOURCE         (1 << 24)
+#define RCAR_DU_COLORKEY_MASK           (1 << 24)
+
 static void rcar_du_plane_write(struct rcar_du_group *rgrp,
                                 unsigned int index, u32 reg, u32 data)
 {
@@ -42,34 +322,45 @@ static void rcar_du_plane_write(struct rcar_du_group *rgrp,
                       data);
 }
 
-static void rcar_du_plane_setup_fb(struct rcar_du_plane *plane)
+static void rcar_du_plane_setup_scanout(struct rcar_du_group *rgrp,
+                                        const struct rcar_du_plane_state *state)
 {
-        struct rcar_du_plane_state *state =
-                to_rcar_plane_state(plane->plane.state);
-        struct drm_framebuffer *fb = plane->plane.state->fb;
-        struct rcar_du_group *rgrp = plane->group;
         unsigned int src_x = state->state.src_x >> 16;
         unsigned int src_y = state->state.src_y >> 16;
         unsigned int index = state->hwindex;
-        struct drm_gem_cma_object *gem;
+        unsigned int pitch;
         bool interlaced;
-        u32 mwr;
+        u32 dma[2];
 
         interlaced = state->state.crtc->state->adjusted_mode.flags
                    & DRM_MODE_FLAG_INTERLACE;
 
+        if (state->source == RCAR_DU_PLANE_MEMORY) {
+                struct drm_framebuffer *fb = state->state.fb;
+                struct drm_gem_cma_object *gem;
+                unsigned int i;
+
+                if (state->format->planes == 2)
+                        pitch = fb->pitches[0];
+                else
+                        pitch = fb->pitches[0] * 8 / state->format->bpp;
+
+                for (i = 0; i < state->format->planes; ++i) {
+                        gem = drm_fb_cma_get_gem_obj(fb, i);
+                        dma[i] = gem->paddr + fb->offsets[i];
+                }
+        } else {
+                pitch = state->state.src_w >> 16;
+                dma[0] = 0;
+                dma[1] = 0;
+        }
+
         /* Memory pitch (expressed in pixels). Must be doubled for interlaced
          * operation with 32bpp formats.
          */
-        if (state->format->planes == 2)
-                mwr = fb->pitches[0];
-        else
-                mwr = fb->pitches[0] * 8 / state->format->bpp;
-
-        if (interlaced && state->format->bpp == 32)
-                mwr *= 2;
-
-        rcar_du_plane_write(rgrp, index, PnMWR, mwr);
+        rcar_du_plane_write(rgrp, index, PnMWR,
+                            (interlaced && state->format->bpp == 32) ?
+                            pitch * 2 : pitch);
 
         /* The Y position is expressed in raster line units and must be doubled
          * for 32bpp formats, according to the R8A7790 datasheet. No mention of
@@ -87,30 +378,25 @@ static void rcar_du_plane_setup_fb(struct rcar_du_plane *plane)
         rcar_du_plane_write(rgrp, index, PnSPYR, src_y *
                             (!interlaced && state->format->bpp == 32 ? 2 : 1));
 
-        gem = drm_fb_cma_get_gem_obj(fb, 0);
-        rcar_du_plane_write(rgrp, index, PnDSA0R, gem->paddr + fb->offsets[0]);
+        rcar_du_plane_write(rgrp, index, PnDSA0R, dma[0]);
 
         if (state->format->planes == 2) {
                 index = (index + 1) % 8;
 
-                rcar_du_plane_write(rgrp, index, PnMWR, fb->pitches[0]);
+                rcar_du_plane_write(rgrp, index, PnMWR, pitch);
 
                 rcar_du_plane_write(rgrp, index, PnSPXR, src_x);
                 rcar_du_plane_write(rgrp, index, PnSPYR, src_y *
                                     (state->format->bpp == 16 ? 2 : 1) / 2);
 
-                gem = drm_fb_cma_get_gem_obj(fb, 1);
-                rcar_du_plane_write(rgrp, index, PnDSA0R,
-                                    gem->paddr + fb->offsets[1]);
+                rcar_du_plane_write(rgrp, index, PnDSA0R, dma[1]);
         }
 }
 
-static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
-                                     unsigned int index)
+static void rcar_du_plane_setup_mode(struct rcar_du_group *rgrp,
+                                     unsigned int index,
+                                     const struct rcar_du_plane_state *state)
 {
-        struct rcar_du_plane_state *state =
-                to_rcar_plane_state(plane->plane.state);
-        struct rcar_du_group *rgrp = plane->group;
         u32 colorkey;
         u32 pnmr;
 
@@ -168,12 +454,10 @@ static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
         }
 }
 
-static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
-                                  unsigned int index)
+static void rcar_du_plane_setup_format_gen2(struct rcar_du_group *rgrp,
+                                            unsigned int index,
+                                            const struct rcar_du_plane_state *state)
 {
-        struct rcar_du_plane_state *state =
-                to_rcar_plane_state(plane->plane.state);
-        struct rcar_du_group *rgrp = plane->group;
         u32 ddcr2 = PnDDCR2_CODE;
         u32 ddcr4;
 
@@ -182,11 +466,8 @@ static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
          * The data format is selected by the DDDF field in PnMR and the EDF
          * field in DDCR4.
          */
-        ddcr4 = rcar_du_plane_read(rgrp, index, PnDDCR4);
-        ddcr4 &= ~PnDDCR4_EDF_MASK;
-        ddcr4 |= state->format->edf | PnDDCR4_CODE;
 
-        rcar_du_plane_setup_mode(plane, index);
+        rcar_du_plane_setup_mode(rgrp, index, state);
 
         if (state->format->planes == 2) {
                 if (state->hwindex != index) {
@@ -204,31 +485,72 @@ static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
         }
 
         rcar_du_plane_write(rgrp, index, PnDDCR2, ddcr2);
+
+        ddcr4 = state->format->edf | PnDDCR4_CODE;
+        if (state->source != RCAR_DU_PLANE_MEMORY)
+                ddcr4 |= PnDDCR4_VSPS;
+
         rcar_du_plane_write(rgrp, index, PnDDCR4, ddcr4);
+}
+
+static void rcar_du_plane_setup_format_gen3(struct rcar_du_group *rgrp,
+                                            unsigned int index,
+                                            const struct rcar_du_plane_state *state)
+{
+        rcar_du_plane_write(rgrp, index, PnMR,
+                            PnMR_SPIM_TP_OFF | state->format->pnmr);
+
+        rcar_du_plane_write(rgrp, index, PnDDCR4,
+                            state->format->edf | PnDDCR4_CODE);
+}
+
+static void rcar_du_plane_setup_format(struct rcar_du_group *rgrp,
+                                       unsigned int index,
+                                       const struct rcar_du_plane_state *state)
+{
+        struct rcar_du_device *rcdu = rgrp->dev;
+
+        if (rcdu->info->gen < 3)
+                rcar_du_plane_setup_format_gen2(rgrp, index, state);
+        else
+                rcar_du_plane_setup_format_gen3(rgrp, index, state);
 
         /* Destination position and size */
-        rcar_du_plane_write(rgrp, index, PnDSXR, plane->plane.state->crtc_w);
-        rcar_du_plane_write(rgrp, index, PnDSYR, plane->plane.state->crtc_h);
-        rcar_du_plane_write(rgrp, index, PnDPXR, plane->plane.state->crtc_x);
-        rcar_du_plane_write(rgrp, index, PnDPYR, plane->plane.state->crtc_y);
-
-        /* Wrap-around and blinking, disabled */
-        rcar_du_plane_write(rgrp, index, PnWASPR, 0);
-        rcar_du_plane_write(rgrp, index, PnWAMWR, 4095);
-        rcar_du_plane_write(rgrp, index, PnBTR, 0);
-        rcar_du_plane_write(rgrp, index, PnMLR, 0);
+        rcar_du_plane_write(rgrp, index, PnDSXR, state->state.crtc_w);
+        rcar_du_plane_write(rgrp, index, PnDSYR, state->state.crtc_h);
+        rcar_du_plane_write(rgrp, index, PnDPXR, state->state.crtc_x);
+        rcar_du_plane_write(rgrp, index, PnDPYR, state->state.crtc_y);
+
+        if (rcdu->info->gen < 3) {
+                /* Wrap-around and blinking, disabled */
+                rcar_du_plane_write(rgrp, index, PnWASPR, 0);
+                rcar_du_plane_write(rgrp, index, PnWAMWR, 4095);
+                rcar_du_plane_write(rgrp, index, PnBTR, 0);
+                rcar_du_plane_write(rgrp, index, PnMLR, 0);
+        }
 }
 
-void rcar_du_plane_setup(struct rcar_du_plane *plane)
+void __rcar_du_plane_setup(struct rcar_du_group *rgrp,
+                           const struct rcar_du_plane_state *state)
 {
-        struct rcar_du_plane_state *state =
-                to_rcar_plane_state(plane->plane.state);
+        struct rcar_du_device *rcdu = rgrp->dev;
 
-        __rcar_du_plane_setup(plane, state->hwindex);
+        rcar_du_plane_setup_format(rgrp, state->hwindex, state);
         if (state->format->planes == 2)
-                __rcar_du_plane_setup(plane, (state->hwindex + 1) % 8);
+                rcar_du_plane_setup_format(rgrp, (state->hwindex + 1) % 8,
+                                           state);
 
-        rcar_du_plane_setup_fb(plane);
+        if (rcdu->info->gen < 3)
+                rcar_du_plane_setup_scanout(rgrp, state);
+
+        if (state->source == RCAR_DU_PLANE_VSPD1) {
+                unsigned int vspd1_sink = rgrp->index ? 2 : 0;
+
+                if (rcdu->vspd1_sink != vspd1_sink) {
+                        rcdu->vspd1_sink = vspd1_sink;
+                        rcar_du_set_dpad0_vsp1_routing(rcdu);
+                }
+        }
 }
 
 static int rcar_du_plane_atomic_check(struct drm_plane *plane,
@@ -263,9 +585,27 @@ static void rcar_du_plane_atomic_update(struct drm_plane *plane,
                                         struct drm_plane_state *old_state)
 {
         struct rcar_du_plane *rplane = to_rcar_plane(plane);
+        struct rcar_du_plane_state *old_rstate;
+        struct rcar_du_plane_state *new_rstate;
+
+        if (!plane->state->crtc)
+                return;
+
+        rcar_du_plane_setup(rplane);
+
+        /* Check whether the source has changed from memory to live source or
+         * from live source to memory. The source has been configured by the
+         * VSPS bit in the PnDDCR4 register. Although the datasheet states that
+         * the bit is updated during vertical blanking, it seems that updates
+         * only occur when the DU group is held in reset through the DSYSR.DRES
+         * bit. We thus need to restart the group if the source changes.
+         */
+        old_rstate = to_rcar_plane_state(old_state);
+        new_rstate = to_rcar_plane_state(plane->state);
 
-        if (plane->state->crtc)
-                rcar_du_plane_setup(rplane);
+        if ((old_rstate->source == RCAR_DU_PLANE_MEMORY) !=
+            (new_rstate->source == RCAR_DU_PLANE_MEMORY))
+                rplane->group->need_restart = true;
 }
 
 static const struct drm_plane_helper_funcs rcar_du_plane_helper_funcs = {
@@ -313,6 +653,7 @@ static void rcar_du_plane_reset(struct drm_plane *plane)
                 return;
 
         state->hwindex = -1;
+        state->source = RCAR_DU_PLANE_MEMORY;
         state->alpha = 255;
         state->colorkey = RCAR_DU_COLORKEY_NONE;
         state->zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.h b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
index 9732bff1911b..b18b7b25dbfa 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
@@ -28,6 +28,12 @@ struct rcar_du_group;
 #define RCAR_DU_NUM_KMS_PLANES          9
 #define RCAR_DU_NUM_HW_PLANES           8
 
+enum rcar_du_plane_source {
+        RCAR_DU_PLANE_MEMORY,
+        RCAR_DU_PLANE_VSPD0,
+        RCAR_DU_PLANE_VSPD1,
+};
+
 struct rcar_du_plane {
         struct drm_plane plane;
         struct rcar_du_group *group;
@@ -52,6 +58,7 @@ struct rcar_du_plane_state {
 
         const struct rcar_du_format_info *format;
         int hwindex;
+        enum rcar_du_plane_source source;
 
         unsigned int alpha;
         unsigned int colorkey;
@@ -64,8 +71,20 @@ to_rcar_plane_state(struct drm_plane_state *state)
         return container_of(state, struct rcar_du_plane_state, state);
 }
 
+int rcar_du_atomic_check_planes(struct drm_device *dev,
+                                struct drm_atomic_state *state);
+
 int rcar_du_planes_init(struct rcar_du_group *rgrp);
 
-void rcar_du_plane_setup(struct rcar_du_plane *plane);
+void __rcar_du_plane_setup(struct rcar_du_group *rgrp,
+                           const struct rcar_du_plane_state *state);
+
+static inline void rcar_du_plane_setup(struct rcar_du_plane *plane)
+{
+        struct rcar_du_plane_state *state =
+                to_rcar_plane_state(plane->plane.state);
+
+        return __rcar_du_plane_setup(plane->group, state);
+}
 
 #endif /* __RCAR_DU_PLANE_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
index 70fcbc471ebd..d2f66068e52c 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -1,7 +1,7 @@
 /*
  * rcar_du_regs.h  --  R-Car Display Unit Registers Definitions
  *
- * Copyright (C) 2013 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -16,6 +16,7 @@
 #define DU0_REG_OFFSET          0x00000
 #define DU1_REG_OFFSET          0x30000
 #define DU2_REG_OFFSET          0x40000
+#define DU3_REG_OFFSET          0x70000
 
 /* -----------------------------------------------------------------------------
  * Display Control Registers
@@ -186,7 +187,7 @@
 
 #define DEFR6                   0x000e8
 #define DEFR6_CODE              (0x7778 << 16)
-#define DEFR6_ODPM22_D2SMR      (0 << 10)
+#define DEFR6_ODPM22_DSMR       (0 << 10)
 #define DEFR6_ODPM22_DISP       (2 << 10)
 #define DEFR6_ODPM22_CDE        (3 << 10)
 #define DEFR6_ODPM22_MASK       (3 << 10)
@@ -260,6 +261,21 @@
 #define DIDSR_PDCS_CLK(n, clk)  (clk << ((n) * 2))
 #define DIDSR_PDCS_MASK(n)      (3 << ((n) * 2))
 
+#define DEFR10                  0x20038
+#define DEFR10_CODE             (0x7795 << 16)
+#define DEFR10_VSPF1_RGB        (0 << 14)
+#define DEFR10_VSPF1_YC         (1 << 14)
+#define DEFR10_DOCF1_RGB        (0 << 12)
+#define DEFR10_DOCF1_YC         (1 << 12)
+#define DEFR10_YCDF0_YCBCR444   (0 << 11)
+#define DEFR10_YCDF0_YCBCR422   (1 << 11)
+#define DEFR10_VSPF0_RGB        (0 << 10)
+#define DEFR10_VSPF0_YC         (1 << 10)
+#define DEFR10_DOCF0_RGB        (0 << 8)
+#define DEFR10_DOCF0_YC         (1 << 8)
+#define DEFR10_TSEL_H3_TCON1    (0 << 1) /* DEFR102 register only (DU2/DU3) */
+#define DEFR10_DEFE10           (1 << 0)
+
 /* -----------------------------------------------------------------------------
  * Display Timing Generation Registers
  */
@@ -389,6 +405,7 @@
 
 #define PnDDCR4                 0x00190
 #define PnDDCR4_CODE            (0x7766 << 16)
+#define PnDDCR4_VSPS            (1 << 13)
 #define PnDDCR4_SDFS_RGB        (0 << 4)
 #define PnDDCR4_SDFS_YC         (5 << 4)
 #define PnDDCR4_SDFS_MASK       (7 << 4)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
index e0a5d8f93963..9d7e5c99caf6 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
@@ -31,12 +31,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .best_encoder = rcar_du_connector_best_encoder,
 };
 
-static void rcar_du_vga_connector_destroy(struct drm_connector *connector)
-{
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-}
-
 static enum drm_connector_status
 rcar_du_vga_connector_detect(struct drm_connector *connector, bool force)
 {
@@ -48,7 +42,7 @@ static const struct drm_connector_funcs connector_funcs = {
         .reset = drm_atomic_helper_connector_reset,
         .detect = rcar_du_vga_connector_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = rcar_du_vga_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
@@ -76,9 +70,6 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_connector_register(connector);
-        if (ret < 0)
-                return ret;
 
         connector->dpms = DRM_MODE_DPMS_OFF;
         drm_object_property_set_value(&connector->base,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
new file mode 100644
index 000000000000..de7ef041182b
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -0,0 +1,384 @@
+/*
+ * rcar_du_vsp.h  --  R-Car Display Unit VSP-Based Compositor
+ *
+ * Copyright (C) 2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_plane_helper.h>
+
+#include <linux/of_platform.h>
+#include <linux/videodev2.h>
+
+#include <media/vsp1.h>
+
+#include "rcar_du_drv.h"
+#include "rcar_du_kms.h"
+#include "rcar_du_vsp.h"
+
+void rcar_du_vsp_enable(struct rcar_du_crtc *crtc)
+{
+        const struct drm_display_mode *mode = &crtc->crtc.state->adjusted_mode;
+        struct rcar_du_device *rcdu = crtc->group->dev;
+        struct rcar_du_plane_state state = {
+                .state = {
+                        .crtc = &crtc->crtc,
+                        .crtc_x = 0,
+                        .crtc_y = 0,
+                        .crtc_w = mode->hdisplay,
+                        .crtc_h = mode->vdisplay,
+                        .src_x = 0,
+                        .src_y = 0,
+                        .src_w = mode->hdisplay << 16,
+                        .src_h = mode->vdisplay << 16,
+                },
+                .format = rcar_du_format_info(DRM_FORMAT_ARGB8888),
+                .source = RCAR_DU_PLANE_VSPD1,
+                .alpha = 255,
+                .colorkey = 0,
+                .zpos = 0,
+        };
+
+        if (rcdu->info->gen >= 3)
+                state.hwindex = (crtc->index % 2) ? 2 : 0;
+        else
+                state.hwindex = crtc->index % 2;
+
+        __rcar_du_plane_setup(crtc->group, &state);
+
+        /* Ensure that the plane source configuration takes effect by requesting
+         * a restart of the group. See rcar_du_plane_atomic_update() for a more
+         * detailed explanation.
+         *
+         * TODO: Check whether this is still needed on Gen3.
+         */
+        crtc->group->need_restart = true;
+
+        vsp1_du_setup_lif(crtc->vsp->vsp, mode->hdisplay, mode->vdisplay);
+}
+
+void rcar_du_vsp_disable(struct rcar_du_crtc *crtc)
+{
+        vsp1_du_setup_lif(crtc->vsp->vsp, 0, 0);
+}
+
+void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc)
+{
+        vsp1_du_atomic_begin(crtc->vsp->vsp);
+}
+
+void rcar_du_vsp_atomic_flush(struct rcar_du_crtc *crtc)
+{
+        vsp1_du_atomic_flush(crtc->vsp->vsp);
+}
+
+/* Keep the two tables in sync. */
+static const u32 formats_kms[] = {
+        DRM_FORMAT_RGB332,
+        DRM_FORMAT_ARGB4444,
+        DRM_FORMAT_XRGB4444,
+        DRM_FORMAT_ARGB1555,
+        DRM_FORMAT_XRGB1555,
+        DRM_FORMAT_RGB565,
+        DRM_FORMAT_BGR888,
+        DRM_FORMAT_RGB888,
+        DRM_FORMAT_BGRA8888,
+        DRM_FORMAT_BGRX8888,
+        DRM_FORMAT_ARGB8888,
+        DRM_FORMAT_XRGB8888,
+        DRM_FORMAT_UYVY,
+        DRM_FORMAT_VYUY,
+        DRM_FORMAT_YUYV,
+        DRM_FORMAT_YVYU,
+        DRM_FORMAT_NV12,
+        DRM_FORMAT_NV21,
+        DRM_FORMAT_NV16,
+        DRM_FORMAT_NV61,
+        DRM_FORMAT_YUV420,
+        DRM_FORMAT_YVU420,
+        DRM_FORMAT_YUV422,
+        DRM_FORMAT_YVU422,
+        DRM_FORMAT_YUV444,
+        DRM_FORMAT_YVU444,
+};
+
+static const u32 formats_v4l2[] = {
+        V4L2_PIX_FMT_RGB332,
+        V4L2_PIX_FMT_ARGB444,
+        V4L2_PIX_FMT_XRGB444,
+        V4L2_PIX_FMT_ARGB555,
+        V4L2_PIX_FMT_XRGB555,
+        V4L2_PIX_FMT_RGB565,
+        V4L2_PIX_FMT_RGB24,
+        V4L2_PIX_FMT_BGR24,
+        V4L2_PIX_FMT_ARGB32,
+        V4L2_PIX_FMT_XRGB32,
+        V4L2_PIX_FMT_ABGR32,
+        V4L2_PIX_FMT_XBGR32,
+        V4L2_PIX_FMT_UYVY,
+        V4L2_PIX_FMT_VYUY,
+        V4L2_PIX_FMT_YUYV,
+        V4L2_PIX_FMT_YVYU,
+        V4L2_PIX_FMT_NV12M,
+        V4L2_PIX_FMT_NV21M,
+        V4L2_PIX_FMT_NV16M,
+        V4L2_PIX_FMT_NV61M,
+        V4L2_PIX_FMT_YUV420M,
+        V4L2_PIX_FMT_YVU420M,
+        V4L2_PIX_FMT_YUV422M,
+        V4L2_PIX_FMT_YVU422M,
+        V4L2_PIX_FMT_YUV444M,
+        V4L2_PIX_FMT_YVU444M,
+};
+
+static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane)
+{
+        struct rcar_du_vsp_plane_state *state =
+                to_rcar_vsp_plane_state(plane->plane.state);
+        struct drm_framebuffer *fb = plane->plane.state->fb;
+        struct v4l2_rect src;
+        struct v4l2_rect dst;
+        dma_addr_t paddr[2] = { 0, };
+        u32 pixelformat = 0;
+        unsigned int i;
+
+        src.left = state->state.src_x >> 16;
+        src.top = state->state.src_y >> 16;
+        src.width = state->state.src_w >> 16;
+        src.height = state->state.src_h >> 16;
+
+        dst.left = state->state.crtc_x;
+        dst.top = state->state.crtc_y;
+        dst.width = state->state.crtc_w;
+        dst.height = state->state.crtc_h;
+
+        for (i = 0; i < state->format->planes; ++i) {
+                struct drm_gem_cma_object *gem;
+
+                gem = drm_fb_cma_get_gem_obj(fb, i);
+                paddr[i] = gem->paddr + fb->offsets[i];
+        }
+
+        for (i = 0; i < ARRAY_SIZE(formats_kms); ++i) {
+                if (formats_kms[i] == state->format->fourcc) {
+                        pixelformat = formats_v4l2[i];
+                        break;
+                }
+        }
+
+        WARN_ON(!pixelformat);
+
+        vsp1_du_atomic_update(plane->vsp->vsp, plane->index, pixelformat,
+                              fb->pitches[0], paddr, &src, &dst);
+}
+
+static int rcar_du_vsp_plane_atomic_check(struct drm_plane *plane,
+                                          struct drm_plane_state *state)
+{
+        struct rcar_du_vsp_plane_state *rstate = to_rcar_vsp_plane_state(state);
+        struct rcar_du_vsp_plane *rplane = to_rcar_vsp_plane(plane);
+        struct rcar_du_device *rcdu = rplane->vsp->dev;
+
+        if (!state->fb || !state->crtc) {
+                rstate->format = NULL;
+                return 0;
+        }
+
+        if (state->src_w >> 16 != state->crtc_w ||
+            state->src_h >> 16 != state->crtc_h) {
+                dev_dbg(rcdu->dev, "%s: scaling not supported\n", __func__);
+                return -EINVAL;
+        }
+
+        rstate->format = rcar_du_format_info(state->fb->pixel_format);
+        if (rstate->format == NULL) {
+                dev_dbg(rcdu->dev, "%s: unsupported format %08x\n", __func__,
+                        state->fb->pixel_format);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void rcar_du_vsp_plane_atomic_update(struct drm_plane *plane,
+                                        struct drm_plane_state *old_state)
+{
+        struct rcar_du_vsp_plane *rplane = to_rcar_vsp_plane(plane);
+
+        if (plane->state->crtc)
+                rcar_du_vsp_plane_setup(rplane);
+        else
+                vsp1_du_atomic_update(rplane->vsp->vsp, rplane->index, 0, 0, 0,
+                                      NULL, NULL);
+}
+
+static const struct drm_plane_helper_funcs rcar_du_vsp_plane_helper_funcs = {
+        .atomic_check = rcar_du_vsp_plane_atomic_check,
+        .atomic_update = rcar_du_vsp_plane_atomic_update,
+};
+
+static struct drm_plane_state *
+rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
+{
+        struct rcar_du_vsp_plane_state *state;
+        struct rcar_du_vsp_plane_state *copy;
+
+        if (WARN_ON(!plane->state))
+                return NULL;
+
+        state = to_rcar_vsp_plane_state(plane->state);
+        copy = kmemdup(state, sizeof(*state), GFP_KERNEL);
+        if (copy == NULL)
+                return NULL;
+
+        __drm_atomic_helper_plane_duplicate_state(plane, &copy->state);
+
+        return &copy->state;
+}
+
+static void rcar_du_vsp_plane_atomic_destroy_state(struct drm_plane *plane,
+                                                   struct drm_plane_state *state)
+{
+        __drm_atomic_helper_plane_destroy_state(plane, state);
+        kfree(to_rcar_vsp_plane_state(state));
+}
+
+static void rcar_du_vsp_plane_reset(struct drm_plane *plane)
+{
+        struct rcar_du_vsp_plane_state *state;
+
+        if (plane->state) {
+                rcar_du_vsp_plane_atomic_destroy_state(plane, plane->state);
+                plane->state = NULL;
+        }
+
+        state = kzalloc(sizeof(*state), GFP_KERNEL);
+        if (state == NULL)
+                return;
+
+        state->alpha = 255;
+
+        plane->state = &state->state;
+        plane->state->plane = plane;
+}
+
+static int rcar_du_vsp_plane_atomic_set_property(struct drm_plane *plane,
+        struct drm_plane_state *state, struct drm_property *property,
+        uint64_t val)
+{
+        struct rcar_du_vsp_plane_state *rstate = to_rcar_vsp_plane_state(state);
+        struct rcar_du_device *rcdu = to_rcar_vsp_plane(plane)->vsp->dev;
+
+        if (property == rcdu->props.alpha)
+                rstate->alpha = val;
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static int rcar_du_vsp_plane_atomic_get_property(struct drm_plane *plane,
+        const struct drm_plane_state *state, struct drm_property *property,
+        uint64_t *val)
+{
+        const struct rcar_du_vsp_plane_state *rstate =
+                container_of(state, const struct rcar_du_vsp_plane_state, state);
+        struct rcar_du_device *rcdu = to_rcar_vsp_plane(plane)->vsp->dev;
+
+        if (property == rcdu->props.alpha)
+                *val = rstate->alpha;
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .reset = rcar_du_vsp_plane_reset,
+        .set_property = drm_atomic_helper_plane_set_property,
+        .destroy = drm_plane_cleanup,
+        .atomic_duplicate_state = rcar_du_vsp_plane_atomic_duplicate_state,
+        .atomic_destroy_state = rcar_du_vsp_plane_atomic_destroy_state,
+        .atomic_set_property = rcar_du_vsp_plane_atomic_set_property,
+        .atomic_get_property = rcar_du_vsp_plane_atomic_get_property,
+};
+
+int rcar_du_vsp_init(struct rcar_du_vsp *vsp)
+{
+        struct rcar_du_device *rcdu = vsp->dev;
+        struct platform_device *pdev;
+        struct device_node *np;
+        unsigned int i;
+        int ret;
+
+        /* Find the VSP device and initialize it. */
+        np = of_parse_phandle(rcdu->dev->of_node, "vsps", vsp->index);
+        if (!np) {
+                dev_err(rcdu->dev, "vsps node not found\n");
+                return -ENXIO;
+        }
+
+        pdev = of_find_device_by_node(np);
+        of_node_put(np);
+        if (!pdev)
+                return -ENXIO;
+
+        vsp->vsp = &pdev->dev;
+
+        ret = vsp1_du_init(vsp->vsp);
+        if (ret < 0)
+                return ret;
+
+         /* The VSP2D (Gen3) has 5 RPFs, but the VSP1D (Gen2) is limited to
+          * 4 RPFs.
+          */
+        vsp->num_planes = rcdu->info->gen >= 3 ? 5 : 4;
+
+        vsp->planes = devm_kcalloc(rcdu->dev, vsp->num_planes,
+                                   sizeof(*vsp->planes), GFP_KERNEL);
+        if (!vsp->planes)
+                return -ENOMEM;
+
+        for (i = 0; i < vsp->num_planes; ++i) {
+                enum drm_plane_type type = i ? DRM_PLANE_TYPE_OVERLAY
+                                         : DRM_PLANE_TYPE_PRIMARY;
+                struct rcar_du_vsp_plane *plane = &vsp->planes[i];
+
+                plane->vsp = vsp;
+                plane->index = i;
+
+                ret = drm_universal_plane_init(rcdu->ddev, &plane->plane,
+                                               1 << vsp->index,
+                                               &rcar_du_vsp_plane_funcs,
+                                               formats_kms,
+                                               ARRAY_SIZE(formats_kms), type,
+                                               NULL);
+                if (ret < 0)
+                        return ret;
+
+                drm_plane_helper_add(&plane->plane,
+                                     &rcar_du_vsp_plane_helper_funcs);
+
+                if (type == DRM_PLANE_TYPE_PRIMARY)
+                        continue;
+
+                drm_object_attach_property(&plane->plane.base,
+                                           rcdu->props.alpha, 255);
+        }
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
new file mode 100644
index 000000000000..df3bf3805c69
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
@@ -0,0 +1,76 @@
+/*
+ * rcar_du_vsp.h  --  R-Car Display Unit VSP-Based Compositor
+ *
+ * Copyright (C) 2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __RCAR_DU_VSP_H__
+#define __RCAR_DU_VSP_H__
+
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+
+struct rcar_du_format_info;
+struct rcar_du_vsp;
+
+struct rcar_du_vsp_plane {
+        struct drm_plane plane;
+        struct rcar_du_vsp *vsp;
+        unsigned int index;
+};
+
+struct rcar_du_vsp {
+        unsigned int index;
+        struct device *vsp;
+        struct rcar_du_device *dev;
+        struct rcar_du_vsp_plane *planes;
+        unsigned int num_planes;
+};
+
+static inline struct rcar_du_vsp_plane *to_rcar_vsp_plane(struct drm_plane *p)
+{
+        return container_of(p, struct rcar_du_vsp_plane, plane);
+}
+
+/**
+ * struct rcar_du_vsp_plane_state - Driver-specific plane state
+ * @state: base DRM plane state
+ * @format: information about the pixel format used by the plane
+ * @alpha: value of the plane alpha property
+ */
+struct rcar_du_vsp_plane_state {
+        struct drm_plane_state state;
+
+        const struct rcar_du_format_info *format;
+
+        unsigned int alpha;
+};
+
+static inline struct rcar_du_vsp_plane_state *
+to_rcar_vsp_plane_state(struct drm_plane_state *state)
+{
+        return container_of(state, struct rcar_du_vsp_plane_state, state);
+}
+
+#ifdef CONFIG_DRM_RCAR_VSP
+int rcar_du_vsp_init(struct rcar_du_vsp *vsp);
+void rcar_du_vsp_enable(struct rcar_du_crtc *crtc);
+void rcar_du_vsp_disable(struct rcar_du_crtc *crtc);
+void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc);
+void rcar_du_vsp_atomic_flush(struct rcar_du_crtc *crtc);
+#else
+static inline int rcar_du_vsp_init(struct rcar_du_vsp *vsp) { return 0; };
+static inline void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) { };
+static inline void rcar_du_vsp_disable(struct rcar_du_crtc *crtc) { };
+static inline void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc) { };
+static inline void rcar_du_vsp_atomic_flush(struct rcar_du_crtc *crtc) { };
+#endif
+
+#endif /* __RCAR_DU_VSP_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h b/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
index 77cf9289ab65..d7d294ba2dbe 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
@@ -1,7 +1,7 @@
 /*
  * rcar_lvds_regs.h  --  R-Car LVDS Interface Registers Definitions
  *
- * Copyright (C) 2013 Renesas Electronics Corporation
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
  *
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  *
@@ -15,28 +15,38 @@
 
 #define LVDCR0                          0x0000
 #define LVDCR0_DUSEL                    (1 << 15)
-#define LVDCR0_DMD                      (1 << 12)
+#define LVDCR0_DMD                      (1 << 12)               /* Gen2 only */
 #define LVDCR0_LVMD_MASK                (0xf << 8)
 #define LVDCR0_LVMD_SHIFT               8
-#define LVDCR0_PLLEN                    (1 << 4)
-#define LVDCR0_BEN                      (1 << 2)
-#define LVDCR0_LVEN                     (1 << 1)
+#define LVDCR0_PLLON                    (1 << 4)
+#define LVDCR0_PWD                      (1 << 2)                /* Gen3 only */
+#define LVDCR0_BEN                      (1 << 2)                /* Gen2 only */
+#define LVDCR0_LVEN                     (1 << 1)                /* Gen2 only */
 #define LVDCR0_LVRES                    (1 << 0)
 
 #define LVDCR1                          0x0004
-#define LVDCR1_CKSEL                    (1 << 15)
-#define LVDCR1_CHSTBY(n)                (3 << (2 + (n) * 2))
-#define LVDCR1_CLKSTBY                  (3 << 0)
+#define LVDCR1_CKSEL                    (1 << 15)               /* Gen2 only */
+#define LVDCR1_CHSTBY_GEN2(n)           (3 << (2 + (n) * 2))    /* Gen2 only */
+#define LVDCR1_CHSTBY_GEN3(n)           (1 << (2 + (n) * 2))    /* Gen3 only */
+#define LVDCR1_CLKSTBY_GEN2             (3 << 0)                /* Gen2 only */
+#define LVDCR1_CLKSTBY_GEN3             (1 << 0)                /* Gen3 only */
 
 #define LVDPLLCR                        0x0008
 #define LVDPLLCR_CEEN                   (1 << 14)
 #define LVDPLLCR_FBEN                   (1 << 13)
 #define LVDPLLCR_COSEL                  (1 << 12)
+/* Gen2 */
 #define LVDPLLCR_PLLDLYCNT_150M         (0x1bf << 0)
 #define LVDPLLCR_PLLDLYCNT_121M         (0x22c << 0)
 #define LVDPLLCR_PLLDLYCNT_60M          (0x77b << 0)
 #define LVDPLLCR_PLLDLYCNT_38M          (0x69a << 0)
 #define LVDPLLCR_PLLDLYCNT_MASK         (0x7ff << 0)
+/* Gen3 */
+#define LVDPLLCR_PLLDIVCNT_42M          (0x014cb << 0)
+#define LVDPLLCR_PLLDIVCNT_85M          (0x00a45 << 0)
+#define LVDPLLCR_PLLDIVCNT_128M         (0x006c3 << 0)
+#define LVDPLLCR_PLLDIVCNT_148M         (0x046c1 << 0)
+#define LVDPLLCR_PLLDIVCNT_MASK         (0x7ffff << 0)
 
 #define LVDCTRCR                        0x000c
 #define LVDCTRCR_CTR3SEL_ZERO           (0 << 12)
diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c
index 9c59f4306883..f5956402fc69 100644
--- a/drivers/media/common/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c
@@ -38,7 +38,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend *fe,
 #endif
 
 /* lnb control */
-#if FE_SUPPORTED(MT312) || FE_SUPPORTED(STV0299)
+#if (FE_SUPPORTED(MT312) || FE_SUPPORTED(STV0299)) && FE_SUPPORTED(PLL)
 static int flexcop_set_voltage(struct dvb_frontend *fe,
                                enum fe_sec_voltage voltage)
 {
@@ -68,7 +68,7 @@ static int flexcop_set_voltage(struct dvb_frontend *fe,
 #endif
 
 #if FE_SUPPORTED(S5H1420) || FE_SUPPORTED(STV0299) || FE_SUPPORTED(MT312)
-static int flexcop_sleep(struct dvb_frontend* fe)
+static int __maybe_unused flexcop_sleep(struct dvb_frontend* fe)
 {
         struct flexcop_device *fc = fe->dvb->priv;
         if (fc->fe_sleep)
diff --git a/drivers/media/common/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c
index 412c5daf2b48..0f5114d406f8 100644
--- a/drivers/media/common/b2c2/flexcop.c
+++ b/drivers/media/common/b2c2/flexcop.c
@@ -1,7 +1,7 @@
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop.c - main module part
- * Copyright (C) 2004-9 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-9 Patrick Boettcher <patrick.boettcher@posteo.de>
  * based on skystar2-driver Copyright (C) 2003 Vadim Catana, skystar@moldova.cc
  *
  * Acknowledgements:
@@ -34,7 +34,7 @@
 #include "flexcop.h"
 
 #define DRIVER_NAME "B2C2 FlexcopII/II(b)/III digital TV receiver chip"
-#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@posteo.de"
 
 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
 #define DEBSTATUS ""
diff --git a/drivers/media/common/cypress_firmware.c b/drivers/media/common/cypress_firmware.c
index 577e82058fdc..50e3f76d4847 100644
--- a/drivers/media/common/cypress_firmware.c
+++ b/drivers/media/common/cypress_firmware.c
@@ -1,6 +1,6 @@
 /*  cypress_firmware.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for downloading the firmware to Cypress FX 1
diff --git a/drivers/media/common/cypress_firmware.h b/drivers/media/common/cypress_firmware.h
index e493cbc7a528..1e4f27356205 100644
--- a/drivers/media/common/cypress_firmware.h
+++ b/drivers/media/common/cypress_firmware.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for downloading the firmware to Cypress FX 1
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index 2a8d9a36d6f0..f3a42834d7d6 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -1167,8 +1167,8 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
                 return rc;
         }
         pr_debug("read fw %s, buffer size=0x%zx\n", fw_filename, fw->size);
-        fw_buf = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT),
-                         GFP_KERNEL | GFP_DMA);
+        fw_buf = kmalloc(ALIGN(fw->size + sizeof(struct sms_firmware),
+                         SMS_ALLOC_ALIGNMENT), GFP_KERNEL | GFP_DMA);
         if (!fw_buf) {
                 pr_err("failed to allocate firmware buffer\n");
                 rc = -ENOMEM;
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index d31f468830cf..9148e14c9d07 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -1015,12 +1015,6 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe)
         }
 }
 
-/* Nothing to do here, as stats are automatically updated */
-static int smsdvb_get_frontend(struct dvb_frontend *fe)
-{
-        return 0;
-}
-
 static int smsdvb_init(struct dvb_frontend *fe)
 {
         struct smsdvb_client_t *client =
@@ -1069,7 +1063,6 @@ static struct dvb_frontend_ops smsdvb_fe_ops = {
         .release = smsdvb_release,
 
         .set_frontend = smsdvb_set_frontend,
-        .get_frontend = smsdvb_get_frontend,
         .get_tune_settings = smsdvb_get_tune_settings,
 
         .read_status = smsdvb_read_status,
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
index 1c1c298d2289..dbdbb84294c5 100644
--- a/drivers/media/dvb-core/dvb-usb-ids.h
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
@@ -1,6 +1,6 @@
 /* dvb-usb-ids.h is part of the DVB USB library.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) see
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) see
  * dvb-usb-init.c for copyright information.
  *
  * a header file containing define's for the USB device supported by the
@@ -118,6 +118,7 @@
 #define USB_PID_DIBCOM_STK807XP                         0x1f90
 #define USB_PID_DIBCOM_STK807XPVR                       0x1f98
 #define USB_PID_DIBCOM_STK8096GP                        0x1fa0
+#define USB_PID_DIBCOM_STK8096PVR                       0x1faa
 #define USB_PID_DIBCOM_NIM8096MD                        0x1fa8
 #define USB_PID_DIBCOM_TFE8096P                         0x1f9C
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
@@ -247,6 +248,7 @@
 #define USB_PID_TECHNOTREND_CONNECT_CT3650              0x300d
 #define USB_PID_TECHNOTREND_CONNECT_S2_4600             0x3011
 #define USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI         0x3012
+#define USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI_2       0x3015
 #define USB_PID_TECHNOTREND_TVSTICK_CT2_4400            0x3014
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2      0x0081
@@ -255,6 +257,10 @@
 #define USB_PID_TERRATEC_CINERGY_T_EXPRESS              0x0062
 #define USB_PID_TERRATEC_CINERGY_T_XXS                  0x0078
 #define USB_PID_TERRATEC_CINERGY_T_XXS_2                0x00ab
+#define USB_PID_TERRATEC_CINERGY_S2_R1                  0x00a8
+#define USB_PID_TERRATEC_CINERGY_S2_R2                  0x00b0
+#define USB_PID_TERRATEC_CINERGY_S2_R3                  0x0102
+#define USB_PID_TERRATEC_CINERGY_S2_R4                  0x0105
 #define USB_PID_TERRATEC_H7                             0x10b4
 #define USB_PID_TERRATEC_H7_2                           0x10a3
 #define USB_PID_TERRATEC_H7_3                           0x10a5
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 40080645341e..4c35eb47472b 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -140,9 +140,12 @@ struct dvb_frontend_private {
 
 static void dvb_frontend_wakeup(struct dvb_frontend *fe);
 static int dtv_get_frontend(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *c,
                             struct dvb_frontend_parameters *p_out);
-static int dtv_property_legacy_params_sync(struct dvb_frontend *fe,
-                                           struct dvb_frontend_parameters *p);
+static int
+dtv_property_legacy_params_sync(struct dvb_frontend *fe,
+                                const struct dtv_frontend_properties *c,
+                                struct dvb_frontend_parameters *p);
 
 static bool has_get_frontend(struct dvb_frontend *fe)
 {
@@ -202,6 +205,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe,
                                    enum fe_status status)
 {
         struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct dvb_fe_events *events = &fepriv->events;
         struct dvb_frontend_event *e;
         int wp;
@@ -209,7 +213,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe,
         dev_dbg(fe->dvb->device, "%s:\n", __func__);
 
         if ((status & FE_HAS_LOCK) && has_get_frontend(fe))
-                dtv_get_frontend(fe, &fepriv->parameters_out);
+                dtv_get_frontend(fe, c, &fepriv->parameters_out);
 
         mutex_lock(&events->mtx);
 
@@ -687,6 +691,7 @@ static int dvb_enable_media_tuner(struct dvb_frontend *fe)
 static int dvb_frontend_thread(void *data)
 {
         struct dvb_frontend *fe = data;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct dvb_frontend_private *fepriv = fe->frontend_priv;
         enum fe_status s;
         enum dvbfe_algo algo;
@@ -807,7 +812,7 @@ restart:
                                         fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
                                         fepriv->delay = HZ / 2;
                                 }
-                                dtv_property_legacy_params_sync(fe, &fepriv->parameters_out);
+                                dtv_property_legacy_params_sync(fe, c, &fepriv->parameters_out);
                                 fe->ops.read_status(fe, &s);
                                 if (s != fepriv->status) {
                                         dvb_frontend_add_event(fe, s); /* update event list */
@@ -899,10 +904,10 @@ void dvb_frontend_sleep_until(ktime_t *waketime, u32 add_usec)
         s32 delta;
 
         *waketime = ktime_add_us(*waketime, add_usec);
-        delta = ktime_us_delta(ktime_get_real(), *waketime);
+        delta = ktime_us_delta(ktime_get_boottime(), *waketime);
         if (delta > 2500) {
                 msleep((delta - 1500) / 1000);
-                delta = ktime_us_delta(ktime_get_real(), *waketime);
+                delta = ktime_us_delta(ktime_get_boottime(), *waketime);
         }
         if (delta > 0)
                 udelay(delta);
@@ -1162,18 +1167,24 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
         _DTV_CMD(DTV_STAT_TOTAL_BLOCK_COUNT, 0, 0),
 };
 
-static void dtv_property_dump(struct dvb_frontend *fe, struct dtv_property *tvp)
+static void dtv_property_dump(struct dvb_frontend *fe,
+                              bool is_set,
+                              struct dtv_property *tvp)
 {
         int i;
 
         if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) {
-                dev_warn(fe->dvb->device, "%s: tvp.cmd = 0x%08x undefined\n",
-                                __func__, tvp->cmd);
+                dev_warn(fe->dvb->device, "%s: %s tvp.cmd = 0x%08x undefined\n",
+                                __func__,
+                                is_set ? "SET" : "GET",
+                                tvp->cmd);
                 return;
         }
 
-        dev_dbg(fe->dvb->device, "%s: tvp.cmd    = 0x%08x (%s)\n", __func__,
-                        tvp->cmd, dtv_cmds[tvp->cmd].name);
+        dev_dbg(fe->dvb->device, "%s: %s tvp.cmd    = 0x%08x (%s)\n", __func__,
+                is_set ? "SET" : "GET",
+                tvp->cmd,
+                dtv_cmds[tvp->cmd].name);
 
         if (dtv_cmds[tvp->cmd].buffer) {
                 dev_dbg(fe->dvb->device, "%s: tvp.u.buffer.len = 0x%02x\n",
@@ -1268,11 +1279,11 @@ static int dtv_property_cache_sync(struct dvb_frontend *fe,
 /* Ensure the cached values are set correctly in the frontend
  * legacy tuning structures, for the advanced tuning API.
  */
-static int dtv_property_legacy_params_sync(struct dvb_frontend *fe,
-                                            struct dvb_frontend_parameters *p)
+static int
+dtv_property_legacy_params_sync(struct dvb_frontend *fe,
+                                const struct dtv_frontend_properties *c,
+                                struct dvb_frontend_parameters *p)
 {
-        const struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-
         p->frequency = c->frequency;
         p->inversion = c->inversion;
 
@@ -1344,16 +1355,17 @@ static int dtv_property_legacy_params_sync(struct dvb_frontend *fe,
  * If p_out is not null, it will update the DVBv3 params pointed by it.
  */
 static int dtv_get_frontend(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *c,
                             struct dvb_frontend_parameters *p_out)
 {
         int r;
 
         if (fe->ops.get_frontend) {
-                r = fe->ops.get_frontend(fe);
+                r = fe->ops.get_frontend(fe, c);
                 if (unlikely(r < 0))
                         return r;
                 if (p_out)
-                        dtv_property_legacy_params_sync(fe, p_out);
+                        dtv_property_legacy_params_sync(fe, c, p_out);
                 return 0;
         }
 
@@ -1589,7 +1601,7 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
                         return r;
         }
 
-        dtv_property_dump(fe, tvp);
+        dtv_property_dump(fe, false, tvp);
 
         return 0;
 }
@@ -1830,6 +1842,8 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
                         return r;
         }
 
+        dtv_property_dump(fe, true, tvp);
+
         switch(tvp->cmd) {
         case DTV_CLEAR:
                 /*
@@ -2073,6 +2087,8 @@ static int dvb_frontend_ioctl_properties(struct file *file,
                         dev_dbg(fe->dvb->device, "%s: Property cache is full, tuning\n", __func__);
 
         } else if (cmd == FE_GET_PROPERTY) {
+                struct dtv_frontend_properties getp = fe->dtv_property_cache;
+
                 dev_dbg(fe->dvb->device, "%s: properties.num = %d\n", __func__, tvps->num);
                 dev_dbg(fe->dvb->device, "%s: properties.props = %p\n", __func__, tvps->props);
 
@@ -2094,17 +2110,18 @@ static int dvb_frontend_ioctl_properties(struct file *file,
                 }
 
                 /*
-                 * Fills the cache out struct with the cache contents, plus
-                 * the data retrieved from get_frontend, if the frontend
-                 * is not idle. Otherwise, returns the cached content
+                 * Let's use our own copy of property cache, in order to
+                 * avoid mangling with DTV zigzag logic, as drivers might
+                 * return crap, if they don't check if the data is available
+                 * before updating the properties cache.
                  */
                 if (fepriv->state != FESTATE_IDLE) {
-                        err = dtv_get_frontend(fe, NULL);
+                        err = dtv_get_frontend(fe, &getp, NULL);
                         if (err < 0)
                                 goto out;
                 }
                 for (i = 0; i < tvps->num; i++) {
-                        err = dtv_property_process_get(fe, c, tvp + i, file);
+                        err = dtv_property_process_get(fe, &getp, tvp + i, file);
                         if (err < 0)
                                 goto out;
                         (tvp + i)->result = err;
@@ -2139,7 +2156,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
          * the user. FE_SET_FRONTEND triggers an initial frontend event
          * with status = 0, which copies output parameters to userspace.
          */
-        dtv_property_legacy_params_sync(fe, &fepriv->parameters_out);
+        dtv_property_legacy_params_sync(fe, c, &fepriv->parameters_out);
 
         /*
          * Be sure that the bandwidth will be filled for all
@@ -2451,7 +2468,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                         u8 last = 1;
                         if (dvb_frontend_debug)
                                 printk("%s switch command: 0x%04lx\n", __func__, swcmd);
-                        nexttime = ktime_get_real();
+                        nexttime = ktime_get_boottime();
                         if (dvb_frontend_debug)
                                 tv[0] = nexttime;
                         /* before sending a command, initialize by sending
@@ -2462,7 +2479,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
 
                         for (i = 0; i < 9; i++) {
                                 if (dvb_frontend_debug)
-                                        tv[i+1] = ktime_get_real();
+                                        tv[i+1] = ktime_get_boottime();
                                 if ((swcmd & 0x01) != last) {
                                         /* set voltage to (last ? 13V : 18V) */
                                         fe->ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
@@ -2509,10 +2526,18 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                 err = dvb_frontend_get_event (fe, parg, file->f_flags);
                 break;
 
-        case FE_GET_FRONTEND:
-                err = dtv_get_frontend(fe, parg);
-                break;
+        case FE_GET_FRONTEND: {
+                struct dtv_frontend_properties getp = fe->dtv_property_cache;
 
+                /*
+                 * Let's use our own copy of property cache, in order to
+                 * avoid mangling with DTV zigzag logic, as drivers might
+                 * return crap, if they don't check if the data is available
+                 * before updating the properties cache.
+                 */
+                err = dtv_get_frontend(fe, &getp, parg);
+                break;
+        }
         case FE_SET_FRONTEND_TUNE_MODE:
                 fepriv->tune_mode_flags = (unsigned long) parg;
                 err = 0;
diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
index 458bcce20e38..9592573a0b41 100644
--- a/drivers/media/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
@@ -449,7 +449,8 @@ struct dvb_frontend_ops {
         int (*set_frontend)(struct dvb_frontend *fe);
         int (*get_tune_settings)(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* settings);
 
-        int (*get_frontend)(struct dvb_frontend *fe);
+        int (*get_frontend)(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *props);
 
         int (*read_status)(struct dvb_frontend *fe, enum fe_status *status);
         int (*read_ber)(struct dvb_frontend* fe, u32* ber);
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 560450a0b32a..1b9732ee0a4f 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -58,7 +58,7 @@ static const char * const dnames[] = {
 #define DVB_MAX_IDS             MAX_DVB_MINORS
 #else
 #define DVB_MAX_IDS             4
-#define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
+#define nums2minor(num, type, id)       ((num << 6) | (id << 4) | type)
 #define MAX_DVB_MINORS          (DVB_MAX_ADAPTERS*64)
 #endif
 
@@ -85,7 +85,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                 file->private_data = dvbdev;
                 replace_fops(file, new_fops);
                 if (file->f_op->open)
-                        err = file->f_op->open(inode,file);
+                        err = file->f_op->open(inode, file);
                 up_read(&minor_rwsem);
                 mutex_unlock(&dvbdev_mutex);
                 return err;
@@ -352,7 +352,7 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
         ret = media_device_register_entity(dvbdev->adapter->mdev,
                                            dvbdev->entity);
         if (ret)
-                return (ret);
+                return ret;
 
         printk(KERN_DEBUG "%s: media entity '%s' registered.\n",
                 __func__, dvbdev->entity->name);
@@ -620,8 +620,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
                         return -ENOMEM;
                 adap->conn = conn;
 
-                adap->conn_pads = kcalloc(1, sizeof(*adap->conn_pads),
-                                            GFP_KERNEL);
+                adap->conn_pads = kzalloc(sizeof(*adap->conn_pads), GFP_KERNEL);
                 if (!adap->conn_pads)
                         return -ENOMEM;
 
@@ -661,7 +660,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
         if (ntuner && ndemod) {
                 ret = media_create_pad_links(mdev,
                                              MEDIA_ENT_F_TUNER,
-                                             tuner, TUNER_PAD_IF_OUTPUT,
+                                             tuner, TUNER_PAD_OUTPUT,
                                              MEDIA_ENT_F_DTV_DEMOD,
                                              demod, 0, MEDIA_LNK_FL_ENABLED,
                                              false);
@@ -868,7 +867,7 @@ int dvb_usercopy(struct file *file,
                         parg = sbuf;
                 } else {
                         /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
+                        mbuf = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL);
                         if (NULL == mbuf)
                                 return -ENOMEM;
                         parg = mbuf;
diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index e23197da84af..8bcde336ffd7 100644
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -866,9 +866,9 @@ err:
         return ret;
 }
 
-static int af9013_get_frontend(struct dvb_frontend *fe)
+static int af9013_get_frontend(struct dvb_frontend *fe,
+                               struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct af9013_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[3];
@@ -1344,6 +1344,10 @@ err:
 static void af9013_release(struct dvb_frontend *fe)
 {
         struct af9013_state *state = fe->demodulator_priv;
+
+        /* stop statistics polling */
+        cancel_delayed_work_sync(&state->statistics_work);
+
         kfree(state);
 }
 
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index bc35206a0821..efebe5ce2429 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -691,10 +691,10 @@ err:
         return ret;
 }
 
-static int af9033_get_frontend(struct dvb_frontend *fe)
+static int af9033_get_frontend(struct dvb_frontend *fe,
+                               struct dtv_frontend_properties *c)
 {
         struct af9033_dev *dev = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[8];
 
@@ -1372,6 +1372,9 @@ static int af9033_remove(struct i2c_client *client)
 
         dev_dbg(&dev->client->dev, "\n");
 
+        /* stop statistics polling */
+        cancel_delayed_work_sync(&dev->stat_work);
+
         dev->fe.ops.release = NULL;
         dev->fe.demodulator_priv = NULL;
         kfree(dev);
diff --git a/drivers/media/dvb-frontends/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c
index 544c5f65d19a..9412fcd1bddb 100644
--- a/drivers/media/dvb-frontends/as102_fe.c
+++ b/drivers/media/dvb-frontends/as102_fe.c
@@ -190,10 +190,10 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe)
         return state->ops->set_tune(state->priv, &tune_args);
 }
 
-static int as102_fe_get_frontend(struct dvb_frontend *fe)
+static int as102_fe_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *c)
 {
         struct as102_state *state = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret = 0;
         struct as10x_tps tps = { 0 };
 
diff --git a/drivers/media/dvb-frontends/atbm8830.c b/drivers/media/dvb-frontends/atbm8830.c
index 8fe552e293ed..47248b868e38 100644
--- a/drivers/media/dvb-frontends/atbm8830.c
+++ b/drivers/media/dvb-frontends/atbm8830.c
@@ -297,9 +297,9 @@ static int atbm8830_set_fe(struct dvb_frontend *fe)
         return 0;
 }
 
-static int atbm8830_get_fe(struct dvb_frontend *fe)
+static int atbm8830_get_fe(struct dvb_frontend *fe,
+                           struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         dprintk("%s\n", __func__);
 
         /* TODO: get real readings from device */
diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
index 6c1e97640f3f..e676b9461a59 100644
--- a/drivers/media/dvb-frontends/au8522_dig.c
+++ b/drivers/media/dvb-frontends/au8522_dig.c
@@ -816,9 +816,9 @@ static int au8522_read_ber(struct dvb_frontend *fe, u32 *ber)
         return au8522_read_ucblocks(fe, ber);
 }
 
-static int au8522_get_frontend(struct dvb_frontend *fe)
+static int au8522_get_frontend(struct dvb_frontend *fe,
+                               struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct au8522_state *state = fe->demodulator_priv;
 
         c->frequency = state->current_frequency;
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index d30275f27644..bb698839e477 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-5, B2C2 inc.
  *
- *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  *  This driver is "hard-coded" to be used with the 1st generation of
  *  Technisat/B2C2's Air2PC ATSC PCI/USB cards/boxes. The pll-programming
@@ -865,5 +865,5 @@ static struct dvb_frontend_ops bcm3510_ops = {
 };
 
 MODULE_DESCRIPTION("Broadcom BCM3510 ATSC (8VSB/16VSB & ITU J83 AnnexB FEC QAM64/256) demodulator driver");
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/bcm3510.h b/drivers/media/dvb-frontends/bcm3510.h
index ff66492fb940..961c2eb87c68 100644
--- a/drivers/media/dvb-frontends/bcm3510.h
+++ b/drivers/media/dvb-frontends/bcm3510.h
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-5, B2C2 inc.
  *
- *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/media/dvb-frontends/bcm3510_priv.h b/drivers/media/dvb-frontends/bcm3510_priv.h
index 3bb1bc2a04f0..67f24686c31b 100644
--- a/drivers/media/dvb-frontends/bcm3510_priv.h
+++ b/drivers/media/dvb-frontends/bcm3510_priv.h
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-5, B2C2 inc.
  *
- *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
index fd033cca6e11..5cad925609e0 100644
--- a/drivers/media/dvb-frontends/cx22700.c
+++ b/drivers/media/dvb-frontends/cx22700.c
@@ -345,9 +345,9 @@ static int cx22700_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int cx22700_get_frontend(struct dvb_frontend *fe)
+static int cx22700_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct cx22700_state* state = fe->demodulator_priv;
         u8 reg09 = cx22700_readreg (state, 0x09);
 
diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
index d2d06dcd7683..c0e54c59cccf 100644
--- a/drivers/media/dvb-frontends/cx22702.c
+++ b/drivers/media/dvb-frontends/cx22702.c
@@ -562,9 +562,9 @@ static int cx22702_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
         return 0;
 }
 
-static int cx22702_get_frontend(struct dvb_frontend *fe)
+static int cx22702_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct cx22702_state *state = fe->demodulator_priv;
 
         u8 reg0C = cx22702_readreg(state, 0x0C);
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index cb36475e322b..6cb81ec12847 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -550,9 +550,9 @@ static int cx24110_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int cx24110_get_frontend(struct dvb_frontend *fe)
+static int cx24110_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct cx24110_state *state = fe->demodulator_priv;
         s32 afc; unsigned sclk;
 
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index 5f77bc80a896..a3f7eb4e609d 100644
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -1560,10 +1560,10 @@ static int cx24117_get_algo(struct dvb_frontend *fe)
         return DVBFE_ALGO_HW;
 }
 
-static int cx24117_get_frontend(struct dvb_frontend *fe)
+static int cx24117_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
         struct cx24117_state *state = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct cx24117_cmd cmd;
         u8 reg, st, inv;
         int ret, idx;
diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
index 3b0ef52bb834..6ccbd86c9490 100644
--- a/drivers/media/dvb-frontends/cx24120.c
+++ b/drivers/media/dvb-frontends/cx24120.c
@@ -1502,9 +1502,9 @@ static int cx24120_sleep(struct dvb_frontend *fe)
         return 0;
 }
 
-static int cx24120_get_frontend(struct dvb_frontend *fe)
+static int cx24120_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct cx24120_state *state = fe->demodulator_priv;
         u8 freq1, freq2, freq3;
 
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index 0fe7fb11124b..113b0949408a 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -945,9 +945,9 @@ static int cx24123_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int cx24123_get_frontend(struct dvb_frontend *fe)
+static int cx24123_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct cx24123_state *state = fe->demodulator_priv;
 
         dprintk("\n");
diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c
index 42fad6aa3958..a674a6312c38 100644
--- a/drivers/media/dvb-frontends/cxd2820r_c.c
+++ b/drivers/media/dvb-frontends/cxd2820r_c.c
@@ -101,10 +101,10 @@ error:
         return ret;
 }
 
-int cxd2820r_get_frontend_c(struct dvb_frontend *fe)
+int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *c)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[2];
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 24a457d9d803..314d3b8c1080 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -313,7 +313,8 @@ static int cxd2820r_read_status(struct dvb_frontend *fe, enum fe_status *status)
         return ret;
 }
 
-static int cxd2820r_get_frontend(struct dvb_frontend *fe)
+static int cxd2820r_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
         int ret;
@@ -326,13 +327,13 @@ static int cxd2820r_get_frontend(struct dvb_frontend *fe)
 
         switch (fe->dtv_property_cache.delivery_system) {
         case SYS_DVBT:
-                ret = cxd2820r_get_frontend_t(fe);
+                ret = cxd2820r_get_frontend_t(fe, p);
                 break;
         case SYS_DVBT2:
-                ret = cxd2820r_get_frontend_t2(fe);
+                ret = cxd2820r_get_frontend_t2(fe, p);
                 break;
         case SYS_DVBC_ANNEX_A:
-                ret = cxd2820r_get_frontend_c(fe);
+                ret = cxd2820r_get_frontend_c(fe, p);
                 break;
         default:
                 ret = -EINVAL;
@@ -606,8 +607,7 @@ static int cxd2820r_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr,
                 int val)
 {
-        struct cxd2820r_priv *priv =
-                        container_of(chip, struct cxd2820r_priv, gpio_chip);
+        struct cxd2820r_priv *priv = gpiochip_get_data(chip);
         u8 gpio[GPIO_COUNT];
 
         dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val);
@@ -620,8 +620,7 @@ static int cxd2820r_gpio_direction_output(struct gpio_chip *chip, unsigned nr,
 
 static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
 {
-        struct cxd2820r_priv *priv =
-                        container_of(chip, struct cxd2820r_priv, gpio_chip);
+        struct cxd2820r_priv *priv = gpiochip_get_data(chip);
         u8 gpio[GPIO_COUNT];
 
         dev_dbg(&priv->i2c->dev, "%s: nr=%d val=%d\n", __func__, nr, val);
@@ -636,8 +635,7 @@ static void cxd2820r_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
 
 static int cxd2820r_gpio_get(struct gpio_chip *chip, unsigned nr)
 {
-        struct cxd2820r_priv *priv =
-                        container_of(chip, struct cxd2820r_priv, gpio_chip);
+        struct cxd2820r_priv *priv = gpiochip_get_data(chip);
 
         dev_dbg(&priv->i2c->dev, "%s: nr=%d\n", __func__, nr);
 
@@ -731,7 +729,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
                 priv->gpio_chip.base = -1; /* dynamic allocation */
                 priv->gpio_chip.ngpio = GPIO_COUNT;
                 priv->gpio_chip.can_sleep = 1;
-                ret = gpiochip_add(&priv->gpio_chip);
+                ret = gpiochip_add_data(&priv->gpio_chip, priv);
                 if (ret)
                         goto error;
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_priv.h b/drivers/media/dvb-frontends/cxd2820r_priv.h
index a0d53f01a8bf..e31c48e53097 100644
--- a/drivers/media/dvb-frontends/cxd2820r_priv.h
+++ b/drivers/media/dvb-frontends/cxd2820r_priv.h
@@ -76,7 +76,8 @@ int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val);
 
 /* cxd2820r_c.c */
 
-int cxd2820r_get_frontend_c(struct dvb_frontend *fe);
+int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *p);
 
 int cxd2820r_set_frontend_c(struct dvb_frontend *fe);
 
@@ -99,7 +100,8 @@ int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe,
 
 /* cxd2820r_t.c */
 
-int cxd2820r_get_frontend_t(struct dvb_frontend *fe);
+int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *p);
 
 int cxd2820r_set_frontend_t(struct dvb_frontend *fe);
 
@@ -122,7 +124,8 @@ int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe,
 
 /* cxd2820r_t2.c */
 
-int cxd2820r_get_frontend_t2(struct dvb_frontend *fe);
+int cxd2820r_get_frontend_t2(struct dvb_frontend *fe,
+                             struct dtv_frontend_properties *p);
 
 int cxd2820r_set_frontend_t2(struct dvb_frontend *fe);
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
index 21abf1b4ed4d..75ce7d8ded00 100644
--- a/drivers/media/dvb-frontends/cxd2820r_t.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t.c
@@ -138,10 +138,10 @@ error:
         return ret;
 }
 
-int cxd2820r_get_frontend_t(struct dvb_frontend *fe)
+int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *c)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[2];
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
index 4e028b41c0d5..704475676234 100644
--- a/drivers/media/dvb-frontends/cxd2820r_t2.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t2.c
@@ -23,8 +23,8 @@
 
 int cxd2820r_set_frontend_t2(struct dvb_frontend *fe)
 {
-        struct cxd2820r_priv *priv = fe->demodulator_priv;
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct cxd2820r_priv *priv = fe->demodulator_priv;
         int ret, i, bw_i;
         u32 if_freq, if_ctl;
         u64 num;
@@ -169,10 +169,10 @@ error:
 
 }
 
-int cxd2820r_get_frontend_t2(struct dvb_frontend *fe)
+int cxd2820r_get_frontend_t2(struct dvb_frontend *fe,
+                             struct dtv_frontend_properties *c)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[2];
 
diff --git a/drivers/media/dvb-frontends/cxd2841er.c b/drivers/media/dvb-frontends/cxd2841er.c
index fdffb2f0ded8..900186ba8e62 100644
--- a/drivers/media/dvb-frontends/cxd2841er.c
+++ b/drivers/media/dvb-frontends/cxd2841er.c
@@ -2090,13 +2090,13 @@ static int cxd2841er_sleep_tc_to_active_c(struct cxd2841er_priv *priv,
         return 0;
 }
 
-static int cxd2841er_get_frontend(struct dvb_frontend *fe)
+static int cxd2841er_get_frontend(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *p)
 {
         enum fe_status status = 0;
         u16 strength = 0, snr = 0;
         u32 errors = 0, ber = 0;
         struct cxd2841er_priv *priv = fe->demodulator_priv;
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 
         dev_dbg(&priv->i2c->dev, "%s()\n", __func__);
         if (priv->state == STATE_ACTIVE_S)
diff --git a/drivers/media/dvb-frontends/dib0070.c b/drivers/media/dvb-frontends/dib0070.c
index 0b8fb5dd1889..ee7d66997ccd 100644
--- a/drivers/media/dvb-frontends/dib0070.c
+++ b/drivers/media/dvb-frontends/dib0070.c
@@ -774,6 +774,6 @@ free_mem:
 }
 EXPORT_SYMBOL(dib0070_attach);
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the DiBcom 0070 base-band RF Tuner");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib0090.c b/drivers/media/dvb-frontends/dib0090.c
index 47cb72243b9d..976ee034a430 100644
--- a/drivers/media/dvb-frontends/dib0090.c
+++ b/drivers/media/dvb-frontends/dib0090.c
@@ -2669,7 +2669,7 @@ free_mem:
 }
 EXPORT_SYMBOL(dib0090_fw_register);
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
-MODULE_AUTHOR("Olivier Grenie <olivier.grenie@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
+MODULE_AUTHOR("Olivier Grenie <olivier.grenie@parrot.com>");
 MODULE_DESCRIPTION("Driver for the DiBcom 0090 base-band RF Tuner");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
index 6ae9899b5b45..d5dfafb4ef13 100644
--- a/drivers/media/dvb-frontends/dib3000.h
+++ b/drivers/media/dvb-frontends/dib3000.h
@@ -2,11 +2,11 @@
  * public header file of the frontend drivers for mobile DVB-T demodulators
  * DiBcom 3000M-B and DiBcom 3000P/M-C (http://www.dibcom.fr/)
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * based on GPL code from DibCom, which has
  *
- * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ * Copyright (C) 2004 Amaury Demol for DiBcom
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License as
@@ -14,7 +14,7 @@
  *
  * Acknowledgements
  *
- *  Amaury Demol (ademol@dibcom.fr) from DiBcom for providing specs and driver
+ *  Amaury Demol from DiBcom for providing specs and driver
  *  sources, on which this driver (and the dvb-dibusb) are based.
  *
  * see Documentation/dvb/README.dvb-usb for more information
diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
index 7a61172d0d45..6821ecb53d63 100644
--- a/drivers/media/dvb-frontends/dib3000mb.c
+++ b/drivers/media/dvb-frontends/dib3000mb.c
@@ -2,11 +2,11 @@
  * Frontend driver for mobile DVB-T demodulator DiBcom 3000M-B
  * DiBcom (http://www.dibcom.fr/)
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * based on GPL code from DibCom, which has
  *
- * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ * Copyright (C) 2004 Amaury Demol for DiBcom
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License as
@@ -14,7 +14,7 @@
  *
  * Acknowledgements
  *
- *  Amaury Demol (ademol@dibcom.fr) from DiBcom for providing specs and driver
+ *  Amaury Demol from DiBcom for providing specs and driver
  *  sources, on which this driver (and the dvb-dibusb) are based.
  *
  * see Documentation/dvb/README.dvb-usb for more information
@@ -36,7 +36,7 @@
 /* Version information */
 #define DRIVER_VERSION "0.1"
 #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator"
-#define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de"
+#define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@posteo.de"
 
 static int debug;
 module_param(debug, int, 0644);
@@ -112,7 +112,8 @@ static u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */
                 }
         };
 
-static int dib3000mb_get_frontend(struct dvb_frontend* fe);
+static int dib3000mb_get_frontend(struct dvb_frontend* fe,
+                                  struct dtv_frontend_properties *c);
 
 static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner)
 {
@@ -359,7 +360,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner)
                 deb_setf("search_state after autosearch %d after %d checks\n",search_state,as_count);
 
                 if (search_state == 1) {
-                        if (dib3000mb_get_frontend(fe) == 0) {
+                        if (dib3000mb_get_frontend(fe, c) == 0) {
                                 deb_setf("reading tuning data from frontend succeeded.\n");
                                 return dib3000mb_set_frontend(fe, 0);
                         }
@@ -450,9 +451,9 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
         return 0;
 }
 
-static int dib3000mb_get_frontend(struct dvb_frontend* fe)
+static int dib3000mb_get_frontend(struct dvb_frontend* fe,
+                                  struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct dib3000_state* state = fe->demodulator_priv;
         enum fe_code_rate *cr;
         u16 tps_val;
diff --git a/drivers/media/dvb-frontends/dib3000mb_priv.h b/drivers/media/dvb-frontends/dib3000mb_priv.h
index 9dc235aa44b7..0459d5c84314 100644
--- a/drivers/media/dvb-frontends/dib3000mb_priv.h
+++ b/drivers/media/dvb-frontends/dib3000mb_priv.h
@@ -1,7 +1,7 @@
 /*
  * dib3000mb_priv.h
  *
- * Copyright (C) 2004 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License as
diff --git a/drivers/media/dvb-frontends/dib3000mc.c b/drivers/media/dvb-frontends/dib3000mc.c
index 583d6b7fabed..da0f1dc5aaf7 100644
--- a/drivers/media/dvb-frontends/dib3000mc.c
+++ b/drivers/media/dvb-frontends/dib3000mc.c
@@ -2,7 +2,7 @@
  * Driver for DiBcom DiB3000MC/P-demodulator.
  *
  * Copyright (C) 2004-7 DiBcom (http://www.dibcom.fr/)
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * This code is partially based on the previous dib3000mc.c .
  *
@@ -636,9 +636,9 @@ struct i2c_adapter * dib3000mc_get_tuner_i2c_master(struct dvb_frontend *demod,
 
 EXPORT_SYMBOL(dib3000mc_get_tuner_i2c_master);
 
-static int dib3000mc_get_frontend(struct dvb_frontend* fe)
+static int dib3000mc_get_frontend(struct dvb_frontend* fe,
+                                  struct dtv_frontend_properties *fep)
 {
-        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct dib3000mc_state *state = fe->demodulator_priv;
         u16 tps = dib3000mc_read_word(state,458);
 
@@ -726,7 +726,7 @@ static int dib3000mc_set_frontend(struct dvb_frontend *fe)
                 if (found == 0 || found == 1)
                         return 0; // no channel found
 
-                dib3000mc_get_frontend(fe);
+                dib3000mc_get_frontend(fe, fep);
         }
 
         ret = dib3000mc_tune(fe);
@@ -939,6 +939,6 @@ static struct dvb_frontend_ops dib3000mc_ops = {
         .read_ucblocks        = dib3000mc_read_unc_blocks,
 };
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the DiBcom 3000MC/P COFDM demodulator");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib3000mc.h b/drivers/media/dvb-frontends/dib3000mc.h
index 74816f793611..b37e69e6a58c 100644
--- a/drivers/media/dvb-frontends/dib3000mc.h
+++ b/drivers/media/dvb-frontends/dib3000mc.h
@@ -2,7 +2,7 @@
  * Driver for DiBcom DiB3000MC/P-demodulator.
  *
  * Copyright (C) 2004-6 DiBcom (http://www.dibcom.fr/)
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher\@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * This code is partially based on the previous dib3000mc.c .
  *
diff --git a/drivers/media/dvb-frontends/dib7000m.c b/drivers/media/dvb-frontends/dib7000m.c
index 35eb71fe3c2b..b3ddae8885ac 100644
--- a/drivers/media/dvb-frontends/dib7000m.c
+++ b/drivers/media/dvb-frontends/dib7000m.c
@@ -1151,9 +1151,9 @@ static int dib7000m_identify(struct dib7000m_state *state)
 }
 
 
-static int dib7000m_get_frontend(struct dvb_frontend* fe)
+static int dib7000m_get_frontend(struct dvb_frontend* fe,
+                                 struct dtv_frontend_properties *fep)
 {
-        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct dib7000m_state *state = fe->demodulator_priv;
         u16 tps = dib7000m_read_word(state,480);
 
@@ -1246,7 +1246,7 @@ static int dib7000m_set_frontend(struct dvb_frontend *fe)
                 if (found == 0 || found == 1)
                         return 0; // no channel found
 
-                dib7000m_get_frontend(fe);
+                dib7000m_get_frontend(fe, fep);
         }
 
         ret = dib7000m_tune(fe);
@@ -1465,6 +1465,6 @@ static struct dvb_frontend_ops dib7000m_ops = {
         .read_ucblocks        = dib7000m_read_unc_blocks,
 };
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the DiBcom 7000MA/MB/PA/PB/MC COFDM demodulator");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c
index 33be5d6b9e10..b861d4437f2a 100644
--- a/drivers/media/dvb-frontends/dib7000p.c
+++ b/drivers/media/dvb-frontends/dib7000p.c
@@ -1405,9 +1405,9 @@ static int dib7000p_identify(struct dib7000p_state *st)
         return 0;
 }
 
-static int dib7000p_get_frontend(struct dvb_frontend *fe)
+static int dib7000p_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *fep)
 {
-        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct dib7000p_state *state = fe->demodulator_priv;
         u16 tps = dib7000p_read_word(state, 463);
 
@@ -1540,7 +1540,7 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe)
                 if (found == 0 || found == 1)
                         return 0;
 
-                dib7000p_get_frontend(fe);
+                dib7000p_get_frontend(fe, fep);
         }
 
         ret = dib7000p_tune(fe);
@@ -2834,7 +2834,7 @@ static struct dvb_frontend_ops dib7000p_ops = {
         .read_ucblocks = dib7000p_read_unc_blocks,
 };
 
-MODULE_AUTHOR("Olivier Grenie <ogrenie@dibcom.fr>");
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Olivier Grenie <olivie.grenie@parrot.com>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the DiBcom 7000PC COFDM demodulator");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c
index 94c26270fff0..ddf9c44877a2 100644
--- a/drivers/media/dvb-frontends/dib8000.c
+++ b/drivers/media/dvb-frontends/dib8000.c
@@ -3382,14 +3382,15 @@ static int dib8000_sleep(struct dvb_frontend *fe)
 
 static int dib8000_read_status(struct dvb_frontend *fe, enum fe_status *stat);
 
-static int dib8000_get_frontend(struct dvb_frontend *fe)
+static int dib8000_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
         struct dib8000_state *state = fe->demodulator_priv;
         u16 i, val = 0;
         enum fe_status stat = 0;
         u8 index_frontend, sub_index_frontend;
 
-        fe->dtv_property_cache.bandwidth_hz = 6000000;
+        c->bandwidth_hz = 6000000;
 
         /*
          * If called to early, get_frontend makes dib8000_tune to either
@@ -3406,7 +3407,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe)
                 if (stat&FE_HAS_SYNC) {
                         dprintk("TMCC lock on the slave%i", index_frontend);
                         /* synchronize the cache with the other frontends */
-                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend]);
+                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c);
                         for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) {
                                 if (sub_index_frontend != index_frontend) {
                                         state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode;
@@ -3426,57 +3427,57 @@ static int dib8000_get_frontend(struct dvb_frontend *fe)
                 }
         }
 
-        fe->dtv_property_cache.isdbt_sb_mode = dib8000_read_word(state, 508) & 0x1;
+        c->isdbt_sb_mode = dib8000_read_word(state, 508) & 0x1;
 
         if (state->revision == 0x8090)
                 val = dib8000_read_word(state, 572);
         else
                 val = dib8000_read_word(state, 570);
-        fe->dtv_property_cache.inversion = (val & 0x40) >> 6;
+        c->inversion = (val & 0x40) >> 6;
         switch ((val & 0x30) >> 4) {
         case 1:
-                fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_2K;
+                c->transmission_mode = TRANSMISSION_MODE_2K;
                 dprintk("dib8000_get_frontend: transmission mode 2K");
                 break;
         case 2:
-                fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_4K;
+                c->transmission_mode = TRANSMISSION_MODE_4K;
                 dprintk("dib8000_get_frontend: transmission mode 4K");
                 break;
         case 3:
         default:
-                fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_8K;
+                c->transmission_mode = TRANSMISSION_MODE_8K;
                 dprintk("dib8000_get_frontend: transmission mode 8K");
                 break;
         }
 
         switch (val & 0x3) {
         case 0:
-                fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_32;
+                c->guard_interval = GUARD_INTERVAL_1_32;
                 dprintk("dib8000_get_frontend: Guard Interval = 1/32 ");
                 break;
         case 1:
-                fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_16;
+                c->guard_interval = GUARD_INTERVAL_1_16;
                 dprintk("dib8000_get_frontend: Guard Interval = 1/16 ");
                 break;
         case 2:
                 dprintk("dib8000_get_frontend: Guard Interval = 1/8 ");
-                fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_8;
+                c->guard_interval = GUARD_INTERVAL_1_8;
                 break;
         case 3:
                 dprintk("dib8000_get_frontend: Guard Interval = 1/4 ");
-                fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_4;
+                c->guard_interval = GUARD_INTERVAL_1_4;
                 break;
         }
 
         val = dib8000_read_word(state, 505);
-        fe->dtv_property_cache.isdbt_partial_reception = val & 1;
-        dprintk("dib8000_get_frontend: partial_reception = %d ", fe->dtv_property_cache.isdbt_partial_reception);
+        c->isdbt_partial_reception = val & 1;
+        dprintk("dib8000_get_frontend: partial_reception = %d ", c->isdbt_partial_reception);
 
         for (i = 0; i < 3; i++) {
                 int show;
 
                 val = dib8000_read_word(state, 493 + i) & 0x0f;
-                fe->dtv_property_cache.layer[i].segment_count = val;
+                c->layer[i].segment_count = val;
 
                 if (val == 0 || val > 13)
                         show = 0;
@@ -3485,41 +3486,41 @@ static int dib8000_get_frontend(struct dvb_frontend *fe)
 
                 if (show)
                         dprintk("dib8000_get_frontend: Layer %d segments = %d ",
-                                i, fe->dtv_property_cache.layer[i].segment_count);
+                                i, c->layer[i].segment_count);
 
                 val = dib8000_read_word(state, 499 + i) & 0x3;
                 /* Interleaving can be 0, 1, 2 or 4 */
                 if (val == 3)
                         val = 4;
-                fe->dtv_property_cache.layer[i].interleaving = val;
+                c->layer[i].interleaving = val;
                 if (show)
                         dprintk("dib8000_get_frontend: Layer %d time_intlv = %d ",
-                                i, fe->dtv_property_cache.layer[i].interleaving);
+                                i, c->layer[i].interleaving);
 
                 val = dib8000_read_word(state, 481 + i);
                 switch (val & 0x7) {
                 case 1:
-                        fe->dtv_property_cache.layer[i].fec = FEC_1_2;
+                        c->layer[i].fec = FEC_1_2;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d Code Rate = 1/2 ", i);
                         break;
                 case 2:
-                        fe->dtv_property_cache.layer[i].fec = FEC_2_3;
+                        c->layer[i].fec = FEC_2_3;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d Code Rate = 2/3 ", i);
                         break;
                 case 3:
-                        fe->dtv_property_cache.layer[i].fec = FEC_3_4;
+                        c->layer[i].fec = FEC_3_4;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d Code Rate = 3/4 ", i);
                         break;
                 case 5:
-                        fe->dtv_property_cache.layer[i].fec = FEC_5_6;
+                        c->layer[i].fec = FEC_5_6;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d Code Rate = 5/6 ", i);
                         break;
                 default:
-                        fe->dtv_property_cache.layer[i].fec = FEC_7_8;
+                        c->layer[i].fec = FEC_7_8;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d Code Rate = 7/8 ", i);
                         break;
@@ -3528,23 +3529,23 @@ static int dib8000_get_frontend(struct dvb_frontend *fe)
                 val = dib8000_read_word(state, 487 + i);
                 switch (val & 0x3) {
                 case 0:
-                        fe->dtv_property_cache.layer[i].modulation = DQPSK;
+                        c->layer[i].modulation = DQPSK;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d DQPSK ", i);
                         break;
                 case 1:
-                        fe->dtv_property_cache.layer[i].modulation = QPSK;
+                        c->layer[i].modulation = QPSK;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d QPSK ", i);
                         break;
                 case 2:
-                        fe->dtv_property_cache.layer[i].modulation = QAM_16;
+                        c->layer[i].modulation = QAM_16;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d QAM16 ", i);
                         break;
                 case 3:
                 default:
-                        fe->dtv_property_cache.layer[i].modulation = QAM_64;
+                        c->layer[i].modulation = QAM_64;
                         if (show)
                                 dprintk("dib8000_get_frontend: Layer %d QAM64 ", i);
                         break;
@@ -3553,16 +3554,16 @@ static int dib8000_get_frontend(struct dvb_frontend *fe)
 
         /* synchronize the cache with the other frontends */
         for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-                state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode = fe->dtv_property_cache.isdbt_sb_mode;
-                state->fe[index_frontend]->dtv_property_cache.inversion = fe->dtv_property_cache.inversion;
-                state->fe[index_frontend]->dtv_property_cache.transmission_mode = fe->dtv_property_cache.transmission_mode;
-                state->fe[index_frontend]->dtv_property_cache.guard_interval = fe->dtv_property_cache.guard_interval;
-                state->fe[index_frontend]->dtv_property_cache.isdbt_partial_reception = fe->dtv_property_cache.isdbt_partial_reception;
+                state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode = c->isdbt_sb_mode;
+                state->fe[index_frontend]->dtv_property_cache.inversion = c->inversion;
+                state->fe[index_frontend]->dtv_property_cache.transmission_mode = c->transmission_mode;
+                state->fe[index_frontend]->dtv_property_cache.guard_interval = c->guard_interval;
+                state->fe[index_frontend]->dtv_property_cache.isdbt_partial_reception = c->isdbt_partial_reception;
                 for (i = 0; i < 3; i++) {
-                        state->fe[index_frontend]->dtv_property_cache.layer[i].segment_count = fe->dtv_property_cache.layer[i].segment_count;
-                        state->fe[index_frontend]->dtv_property_cache.layer[i].interleaving = fe->dtv_property_cache.layer[i].interleaving;
-                        state->fe[index_frontend]->dtv_property_cache.layer[i].fec = fe->dtv_property_cache.layer[i].fec;
-                        state->fe[index_frontend]->dtv_property_cache.layer[i].modulation = fe->dtv_property_cache.layer[i].modulation;
+                        state->fe[index_frontend]->dtv_property_cache.layer[i].segment_count = c->layer[i].segment_count;
+                        state->fe[index_frontend]->dtv_property_cache.layer[i].interleaving = c->layer[i].interleaving;
+                        state->fe[index_frontend]->dtv_property_cache.layer[i].fec = c->layer[i].fec;
+                        state->fe[index_frontend]->dtv_property_cache.layer[i].modulation = c->layer[i].modulation;
                 }
         }
         return 0;
@@ -3671,7 +3672,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe)
                         if (state->channel_parameters_set == 0) { /* searching */
                                 if ((dib8000_get_status(state->fe[index_frontend]) == FE_STATUS_DEMOD_SUCCESS) || (dib8000_get_status(state->fe[index_frontend]) == FE_STATUS_FFT_SUCCESS)) {
                                         dprintk("autosearch succeeded on fe%i", index_frontend);
-                                        dib8000_get_frontend(state->fe[index_frontend]); /* we read the channel parameters from the frontend which was successful */
+                                        dib8000_get_frontend(state->fe[index_frontend], c); /* we read the channel parameters from the frontend which was successful */
                                         state->channel_parameters_set = 1;
 
                                         for (l = 0; (l < MAX_NUMBER_OF_FRONTENDS) && (state->fe[l] != NULL); l++) {
@@ -4516,6 +4517,6 @@ void *dib8000_attach(struct dib8000_ops *ops)
 }
 EXPORT_SYMBOL(dib8000_attach);
 
-MODULE_AUTHOR("Olivier Grenie <Olivier.Grenie@dibcom.fr, " "Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Olivier Grenie <Olivier.Grenie@parrot.com, Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the DiBcom 8000 ISDB-T demodulator");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c
index 8f92aca0b073..bab8c5a980a2 100644
--- a/drivers/media/dvb-frontends/dib9000.c
+++ b/drivers/media/dvb-frontends/dib9000.c
@@ -1889,7 +1889,8 @@ static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_fron
         return 0;
 }
 
-static int dib9000_get_frontend(struct dvb_frontend *fe)
+static int dib9000_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         u8 index_frontend, sub_index_frontend;
@@ -1909,7 +1910,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe)
                         dprintk("TPS lock on the slave%i", index_frontend);
 
                         /* synchronize the cache with the other frontends */
-                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend]);
+                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c);
                         for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL);
                              sub_index_frontend++) {
                                 if (sub_index_frontend != index_frontend) {
@@ -1943,14 +1944,14 @@ static int dib9000_get_frontend(struct dvb_frontend *fe)
 
         /* synchronize the cache with the other frontends */
         for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-                state->fe[index_frontend]->dtv_property_cache.inversion = fe->dtv_property_cache.inversion;
-                state->fe[index_frontend]->dtv_property_cache.transmission_mode = fe->dtv_property_cache.transmission_mode;
-                state->fe[index_frontend]->dtv_property_cache.guard_interval = fe->dtv_property_cache.guard_interval;
-                state->fe[index_frontend]->dtv_property_cache.modulation = fe->dtv_property_cache.modulation;
-                state->fe[index_frontend]->dtv_property_cache.hierarchy = fe->dtv_property_cache.hierarchy;
-                state->fe[index_frontend]->dtv_property_cache.code_rate_HP = fe->dtv_property_cache.code_rate_HP;
-                state->fe[index_frontend]->dtv_property_cache.code_rate_LP = fe->dtv_property_cache.code_rate_LP;
-                state->fe[index_frontend]->dtv_property_cache.rolloff = fe->dtv_property_cache.rolloff;
+                state->fe[index_frontend]->dtv_property_cache.inversion = c->inversion;
+                state->fe[index_frontend]->dtv_property_cache.transmission_mode = c->transmission_mode;
+                state->fe[index_frontend]->dtv_property_cache.guard_interval = c->guard_interval;
+                state->fe[index_frontend]->dtv_property_cache.modulation = c->modulation;
+                state->fe[index_frontend]->dtv_property_cache.hierarchy = c->hierarchy;
+                state->fe[index_frontend]->dtv_property_cache.code_rate_HP = c->code_rate_HP;
+                state->fe[index_frontend]->dtv_property_cache.code_rate_LP = c->code_rate_LP;
+                state->fe[index_frontend]->dtv_property_cache.rolloff = c->rolloff;
         }
         ret = 0;
 
@@ -2083,7 +2084,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe)
 
         /* synchronize all the channel cache */
         state->get_frontend_internal = 1;
-        dib9000_get_frontend(state->fe[0]);
+        dib9000_get_frontend(state->fe[0], &state->fe[0]->dtv_property_cache);
         state->get_frontend_internal = 0;
 
         /* retune the other frontends with the found channel */
@@ -2589,7 +2590,7 @@ static struct dvb_frontend_ops dib9000_ops = {
         .read_ucblocks = dib9000_read_unc_blocks,
 };
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
-MODULE_AUTHOR("Olivier Grenie <ogrenie@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
+MODULE_AUTHOR("Olivier Grenie <olivier.grenie@parrot.com>");
 MODULE_DESCRIPTION("Driver for the DiBcom 9000 COFDM demodulator");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dibx000_common.c b/drivers/media/dvb-frontends/dibx000_common.c
index 43be7238311e..723358d7ca84 100644
--- a/drivers/media/dvb-frontends/dibx000_common.c
+++ b/drivers/media/dvb-frontends/dibx000_common.c
@@ -510,6 +510,6 @@ u32 systime(void)
 }
 EXPORT_SYMBOL(systime);
 
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Common function the DiBcom demodulator family");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index 14e996d45fac..e5bd8c62ad3a 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
@@ -70,9 +70,12 @@ static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 }
 
 /*
- * Only needed if it actually reads something from the hardware
+ * Should only be implemented if it actually reads something from the hardware.
+ * Also, it should check for the locks, in order to avoid report wrong data
+ * to userspace.
  */
-static int dvb_dummy_fe_get_frontend(struct dvb_frontend *fe)
+static int dvb_dummy_fe_get_frontend(struct dvb_frontend *fe,
+                                     struct dtv_frontend_properties *p)
 {
         return 0;
 }
diff --git a/drivers/media/dvb-frontends/hd29l2.c b/drivers/media/dvb-frontends/hd29l2.c
index 40e359f2d17d..1c7eb477e2cd 100644
--- a/drivers/media/dvb-frontends/hd29l2.c
+++ b/drivers/media/dvb-frontends/hd29l2.c
@@ -560,11 +560,11 @@ static int hd29l2_get_frontend_algo(struct dvb_frontend *fe)
         return DVBFE_ALGO_CUSTOM;
 }
 
-static int hd29l2_get_frontend(struct dvb_frontend *fe)
+static int hd29l2_get_frontend(struct dvb_frontend *fe,
+                               struct dtv_frontend_properties *c)
 {
         int ret;
         struct hd29l2_priv *priv = fe->demodulator_priv;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         u8 buf[3];
         u32 if_ctl;
         char *str_constellation, *str_code_rate, *str_constellation_code_rate,
diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
index 0977871232a2..2f3d0519e19b 100644
--- a/drivers/media/dvb-frontends/l64781.c
+++ b/drivers/media/dvb-frontends/l64781.c
@@ -243,9 +243,9 @@ static int apply_frontend_param(struct dvb_frontend *fe)
         return 0;
 }
 
-static int get_frontend(struct dvb_frontend *fe)
+static int get_frontend(struct dvb_frontend *fe,
+                        struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct l64781_state* state = fe->demodulator_priv;
         int tmp;
 
diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
index 7880f71ccd8a..f51a3a0b3949 100644
--- a/drivers/media/dvb-frontends/lg2160.c
+++ b/drivers/media/dvb-frontends/lg2160.c
@@ -942,101 +942,102 @@ static int lg216x_read_rs_err_count(struct lg216x_state *state, u16 *err)
 
 /* ------------------------------------------------------------------------ */
 
-static int lg216x_get_frontend(struct dvb_frontend *fe)
+static int lg216x_get_frontend(struct dvb_frontend *fe,
+                               struct dtv_frontend_properties *c)
 {
         struct lg216x_state *state = fe->demodulator_priv;
         int ret;
 
         lg_dbg("\n");
 
-        fe->dtv_property_cache.modulation = VSB_8;
-        fe->dtv_property_cache.frequency = state->current_frequency;
-        fe->dtv_property_cache.delivery_system = SYS_ATSCMH;
+        c->modulation = VSB_8;
+        c->frequency = state->current_frequency;
+        c->delivery_system = SYS_ATSCMH;
 
         ret = lg216x_get_fic_version(state,
-                                     &fe->dtv_property_cache.atscmh_fic_ver);
+                                     &c->atscmh_fic_ver);
         if (lg_fail(ret))
                 goto fail;
-        if (state->fic_ver != fe->dtv_property_cache.atscmh_fic_ver) {
-                state->fic_ver = fe->dtv_property_cache.atscmh_fic_ver;
+        if (state->fic_ver != c->atscmh_fic_ver) {
+                state->fic_ver = c->atscmh_fic_ver;
 
 #if 0
                 ret = lg2160_get_parade_id(state,
-                                &fe->dtv_property_cache.atscmh_parade_id);
+                                &c->atscmh_parade_id);
                 if (lg_fail(ret))
                         goto fail;
 /* #else */
-                fe->dtv_property_cache.atscmh_parade_id = state->parade_id;
+                c->atscmh_parade_id = state->parade_id;
 #endif
                 ret = lg216x_get_nog(state,
-                                     &fe->dtv_property_cache.atscmh_nog);
+                                     &c->atscmh_nog);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_tnog(state,
-                                      &fe->dtv_property_cache.atscmh_tnog);
+                                      &c->atscmh_tnog);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_sgn(state,
-                                     &fe->dtv_property_cache.atscmh_sgn);
+                                     &c->atscmh_sgn);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_prc(state,
-                                     &fe->dtv_property_cache.atscmh_prc);
+                                     &c->atscmh_prc);
                 if (lg_fail(ret))
                         goto fail;
 
                 ret = lg216x_get_rs_frame_mode(state,
                         (enum atscmh_rs_frame_mode *)
-                        &fe->dtv_property_cache.atscmh_rs_frame_mode);
+                        &c->atscmh_rs_frame_mode);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_rs_frame_ensemble(state,
                         (enum atscmh_rs_frame_ensemble *)
-                        &fe->dtv_property_cache.atscmh_rs_frame_ensemble);
+                        &c->atscmh_rs_frame_ensemble);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_rs_code_mode(state,
                         (enum atscmh_rs_code_mode *)
-                        &fe->dtv_property_cache.atscmh_rs_code_mode_pri,
+                        &c->atscmh_rs_code_mode_pri,
                         (enum atscmh_rs_code_mode *)
-                        &fe->dtv_property_cache.atscmh_rs_code_mode_sec);
+                        &c->atscmh_rs_code_mode_sec);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_sccc_block_mode(state,
                         (enum atscmh_sccc_block_mode *)
-                        &fe->dtv_property_cache.atscmh_sccc_block_mode);
+                        &c->atscmh_sccc_block_mode);
                 if (lg_fail(ret))
                         goto fail;
                 ret = lg216x_get_sccc_code_mode(state,
                         (enum atscmh_sccc_code_mode *)
-                        &fe->dtv_property_cache.atscmh_sccc_code_mode_a,
+                        &c->atscmh_sccc_code_mode_a,
                         (enum atscmh_sccc_code_mode *)
-                        &fe->dtv_property_cache.atscmh_sccc_code_mode_b,
+                        &c->atscmh_sccc_code_mode_b,
                         (enum atscmh_sccc_code_mode *)
-                        &fe->dtv_property_cache.atscmh_sccc_code_mode_c,
+                        &c->atscmh_sccc_code_mode_c,
                         (enum atscmh_sccc_code_mode *)
-                        &fe->dtv_property_cache.atscmh_sccc_code_mode_d);
+                        &c->atscmh_sccc_code_mode_d);
                 if (lg_fail(ret))
                         goto fail;
         }
 #if 0
         ret = lg216x_read_fic_err_count(state,
-                                (u8 *)&fe->dtv_property_cache.atscmh_fic_err);
+                                (u8 *)&c->atscmh_fic_err);
         if (lg_fail(ret))
                 goto fail;
         ret = lg216x_read_crc_err_count(state,
-                                &fe->dtv_property_cache.atscmh_crc_err);
+                                &c->atscmh_crc_err);
         if (lg_fail(ret))
                 goto fail;
         ret = lg216x_read_rs_err_count(state,
-                                &fe->dtv_property_cache.atscmh_rs_err);
+                                &c->atscmh_rs_err);
         if (lg_fail(ret))
                 goto fail;
 
         switch (state->cfg->lg_chip) {
         case LG2160:
-                if (((fe->dtv_property_cache.atscmh_rs_err >= 240) &&
-                     (fe->dtv_property_cache.atscmh_crc_err >= 240)) &&
+                if (((c->atscmh_rs_err >= 240) &&
+                     (c->atscmh_crc_err >= 240)) &&
                     ((jiffies_to_msecs(jiffies) - state->last_reset) > 6000))
                         ret = lg216x_soft_reset(state);
                 break;
@@ -1054,14 +1055,17 @@ fail:
 static int lg216x_get_property(struct dvb_frontend *fe,
                                struct dtv_property *tvp)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
         return (DTV_ATSCMH_FIC_VER == tvp->cmd) ?
-                lg216x_get_frontend(fe) : 0;
+                lg216x_get_frontend(fe, c) : 0;
 }
 
 
 static int lg2160_set_frontend(struct dvb_frontend *fe)
 {
         struct lg216x_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
 
         lg_dbg("(%d)\n", fe->dtv_property_cache.frequency);
@@ -1129,7 +1133,7 @@ static int lg2160_set_frontend(struct dvb_frontend *fe)
         ret = lg216x_enable_fic(state, 1);
         lg_fail(ret);
 
-        lg216x_get_frontend(fe);
+        lg216x_get_frontend(fe, c);
 fail:
         return ret;
 }
diff --git a/drivers/media/dvb-frontends/lgdt3305.c b/drivers/media/dvb-frontends/lgdt3305.c
index 47121866163d..4503e8852fd1 100644
--- a/drivers/media/dvb-frontends/lgdt3305.c
+++ b/drivers/media/dvb-frontends/lgdt3305.c
@@ -812,9 +812,9 @@ fail:
         return ret;
 }
 
-static int lgdt3305_get_frontend(struct dvb_frontend *fe)
+static int lgdt3305_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct lgdt3305_state *state = fe->demodulator_priv;
 
         lg_dbg("\n");
diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index 721fbc07e9ee..179c26e5eb4e 100644
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -1040,10 +1040,10 @@ fail:
         return ret;
 }
 
-static int lgdt3306a_get_frontend(struct dvb_frontend *fe)
+static int lgdt3306a_get_frontend(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *p)
 {
         struct lgdt3306a_state *state = fe->demodulator_priv;
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 
         dbg_info("(%u, %d)\n",
                  state->current_frequency, state->current_modulation);
diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index cf3cc20510da..96bf254da21e 100644
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -439,10 +439,11 @@ static int lgdt330x_set_parameters(struct dvb_frontend *fe)
         return 0;
 }
 
-static int lgdt330x_get_frontend(struct dvb_frontend *fe)
+static int lgdt330x_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct lgdt330x_state *state = fe->demodulator_priv;
+
         p->frequency = state->current_frequency;
         return 0;
 }
diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
index 7bbb2c18c2dd..fbfd87b5b803 100644
--- a/drivers/media/dvb-frontends/lgs8gl5.c
+++ b/drivers/media/dvb-frontends/lgs8gl5.c
@@ -336,10 +336,11 @@ lgs8gl5_set_frontend(struct dvb_frontend *fe)
 
 
 static int
-lgs8gl5_get_frontend(struct dvb_frontend *fe)
+lgs8gl5_get_frontend(struct dvb_frontend *fe,
+                     struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct lgs8gl5_state *state = fe->demodulator_priv;
+
         u8 inv = lgs8gl5_read_reg(state, REG_INVERSION);
 
         p->inversion = (inv & REG_INVERSION_ON) ? INVERSION_ON : INVERSION_OFF;
diff --git a/drivers/media/dvb-frontends/lgs8gxx.c b/drivers/media/dvb-frontends/lgs8gxx.c
index e2c191c8b196..919daeb96747 100644
--- a/drivers/media/dvb-frontends/lgs8gxx.c
+++ b/drivers/media/dvb-frontends/lgs8gxx.c
@@ -672,7 +672,7 @@ static int lgs8gxx_write(struct dvb_frontend *fe, const u8 buf[], int len)
 
 static int lgs8gxx_set_fe(struct dvb_frontend *fe)
 {
-
+        struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
         struct lgs8gxx_state *priv = fe->demodulator_priv;
 
         dprintk("%s\n", __func__);
@@ -689,17 +689,7 @@ static int lgs8gxx_set_fe(struct dvb_frontend *fe)
 
         msleep(10);
 
-        return 0;
-}
-
-static int lgs8gxx_get_fe(struct dvb_frontend *fe)
-{
-        struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
-        dprintk("%s\n", __func__);
-
         /* TODO: get real readings from device */
-        /* inversion status */
-        fe_params->inversion = INVERSION_OFF;
 
         /* bandwidth */
         fe_params->bandwidth_hz = 8000000;
@@ -1016,7 +1006,6 @@ static struct dvb_frontend_ops lgs8gxx_ops = {
         .i2c_gate_ctrl = lgs8gxx_i2c_gate_ctrl,
 
         .set_frontend = lgs8gxx_set_fe,
-        .get_frontend = lgs8gxx_get_fe,
         .get_tune_settings = lgs8gxx_get_tune_settings,
 
         .read_status = lgs8gxx_read_status,
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index ce73a5ec6036..76883600ec6f 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -791,11 +791,11 @@ err:
         return ret;
 }
 
-static int m88ds3103_get_frontend(struct dvb_frontend *fe)
+static int m88ds3103_get_frontend(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *c)
 {
         struct m88ds3103_dev *dev = fe->demodulator_priv;
         struct i2c_client *client = dev->client;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[3];
 
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 9b6f464c48bd..a09b12313a73 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -708,10 +708,11 @@ static int m88rs2000_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int m88rs2000_get_frontend(struct dvb_frontend *fe)
+static int m88rs2000_get_frontend(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct m88rs2000_state *state = fe->demodulator_priv;
+
         c->fec_inner = state->fec_inner;
         c->frequency = state->tuner_frequency;
         c->symbol_rate = state->symbol_rate;
diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
index cfc005ee11d8..fb88dddaf3a3 100644
--- a/drivers/media/dvb-frontends/mb86a20s.c
+++ b/drivers/media/dvb-frontends/mb86a20s.c
@@ -2028,16 +2028,6 @@ static int mb86a20s_read_signal_strength_from_cache(struct dvb_frontend *fe,
         return 0;
 }
 
-static int mb86a20s_get_frontend_dummy(struct dvb_frontend *fe)
-{
-        /*
-         * get_frontend is now handled together with other stats
-         * retrival, when read_status() is called, as some statistics
-         * will depend on the layers detection.
-         */
-        return 0;
-};
-
 static int mb86a20s_tune(struct dvb_frontend *fe,
                         bool re_tune,
                         unsigned int mode_flags,
@@ -2136,7 +2126,6 @@ static struct dvb_frontend_ops mb86a20s_ops = {
 
         .init = mb86a20s_initfe,
         .set_frontend = mb86a20s_set_frontend,
-        .get_frontend = mb86a20s_get_frontend_dummy,
         .read_status = mb86a20s_read_status_and_stats,
         .read_signal_strength = mb86a20s_read_signal_strength_from_cache,
         .tune = mb86a20s_tune,
diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
index c36e6764eead..fc08429c99b7 100644
--- a/drivers/media/dvb-frontends/mt312.c
+++ b/drivers/media/dvb-frontends/mt312.c
@@ -647,9 +647,9 @@ static int mt312_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int mt312_get_frontend(struct dvb_frontend *fe)
+static int mt312_get_frontend(struct dvb_frontend *fe,
+                              struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct mt312_state *state = fe->demodulator_priv;
         int ret;
 
diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
index 123bb2f8e4b6..c0bb6328956b 100644
--- a/drivers/media/dvb-frontends/mt352.c
+++ b/drivers/media/dvb-frontends/mt352.c
@@ -311,9 +311,9 @@ static int mt352_set_parameters(struct dvb_frontend *fe)
         return 0;
 }
 
-static int mt352_get_parameters(struct dvb_frontend* fe)
+static int mt352_get_parameters(struct dvb_frontend* fe,
+                                struct dtv_frontend_properties *op)
 {
-        struct dtv_frontend_properties *op = &fe->dtv_property_cache;
         struct mt352_state* state = fe->demodulator_priv;
         u16 tps;
         u16 div;
diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
index 35b1053b3640..a165af990672 100644
--- a/drivers/media/dvb-frontends/or51132.c
+++ b/drivers/media/dvb-frontends/or51132.c
@@ -375,9 +375,9 @@ static int or51132_set_parameters(struct dvb_frontend *fe)
         return 0;
 }
 
-static int or51132_get_parameters(struct dvb_frontend* fe)
+static int or51132_get_parameters(struct dvb_frontend* fe,
+                                  struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct or51132_state* state = fe->demodulator_priv;
         int status;
         int retry = 1;
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index b792f305cf15..3f96429af0e5 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -279,11 +279,11 @@ err:
         return ret;
 }
 
-static int rtl2830_get_frontend(struct dvb_frontend *fe)
+static int rtl2830_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
         struct i2c_client *client = fe->demodulator_priv;
         struct rtl2830_dev *dev = i2c_get_clientdata(client);
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[3];
 
@@ -900,6 +900,9 @@ static int rtl2830_remove(struct i2c_client *client)
 
         dev_dbg(&client->dev, "\n");
 
+        /* stop statistics polling */
+        cancel_delayed_work_sync(&dev->stat_work);
+
         i2c_del_mux_adapter(dev->adapter);
         regmap_exit(dev->regmap);
         kfree(dev);
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 10f2119935da..c2469fb42f12 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -575,11 +575,11 @@ err:
         return ret;
 }
 
-static int rtl2832_get_frontend(struct dvb_frontend *fe)
+static int rtl2832_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *c)
 {
         struct rtl2832_dev *dev = fe->demodulator_priv;
         struct i2c_client *client = dev->client;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret;
         u8 buf[3];
 
diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
index 10964848a2f1..c68965ad97c0 100644
--- a/drivers/media/dvb-frontends/s5h1409.c
+++ b/drivers/media/dvb-frontends/s5h1409.c
@@ -925,9 +925,9 @@ static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber)
         return s5h1409_read_ucblocks(fe, ber);
 }
 
-static int s5h1409_get_frontend(struct dvb_frontend *fe)
+static int s5h1409_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct s5h1409_state *state = fe->demodulator_priv;
 
         p->frequency = state->current_frequency;
diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
index 9afc3f42290e..90f86e82b087 100644
--- a/drivers/media/dvb-frontends/s5h1411.c
+++ b/drivers/media/dvb-frontends/s5h1411.c
@@ -840,9 +840,9 @@ static int s5h1411_read_ber(struct dvb_frontend *fe, u32 *ber)
         return s5h1411_read_ucblocks(fe, ber);
 }
 
-static int s5h1411_get_frontend(struct dvb_frontend *fe)
+static int s5h1411_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct s5h1411_state *state = fe->demodulator_priv;
 
         p->frequency = state->current_frequency;
diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
index 9c22a4c70d87..d7d0b7d57ad7 100644
--- a/drivers/media/dvb-frontends/s5h1420.c
+++ b/drivers/media/dvb-frontends/s5h1420.c
@@ -756,9 +756,9 @@ static int s5h1420_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int s5h1420_get_frontend(struct dvb_frontend* fe)
+static int s5h1420_get_frontend(struct dvb_frontend* fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct s5h1420_state* state = fe->demodulator_priv;
 
         p->frequency = state->tunedfreq + s5h1420_getfreqoffset(state);
diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
index d6a8fa63040b..b5e3d90eba5e 100644
--- a/drivers/media/dvb-frontends/s921.c
+++ b/drivers/media/dvb-frontends/s921.c
@@ -433,9 +433,9 @@ static int s921_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int s921_get_frontend(struct dvb_frontend *fe)
+static int s921_get_frontend(struct dvb_frontend *fe,
+                             struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct s921_state *state = fe->demodulator_priv;
 
         /* FIXME: Probably it is possible to get it from regs f1 and f2 */
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 2b93241d4bc1..8bf716a8ea58 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -225,22 +225,18 @@ static int si2165_writereg32(struct si2165_state *state, const u16 reg, u32 val)
 static int si2165_writereg_mask8(struct si2165_state *state, const u16 reg,
                                  u8 val, u8 mask)
 {
-        int ret;
-        u8 tmp;
-
         if (mask != 0xff) {
-                ret = si2165_readreg8(state, reg, &tmp);
+                u8 tmp;
+                int ret = si2165_readreg8(state, reg, &tmp);
+
                 if (ret < 0)
-                        goto err;
+                        return ret;
 
                 val &= mask;
                 tmp &= ~mask;
                 val |= tmp;
         }
-
-        ret = si2165_writereg8(state, reg, val);
-err:
-        return ret;
+        return si2165_writereg8(state, reg, val);
 }
 
 #define REG16(reg, val) { (reg), (val) & 0xff }, { (reg)+1, (val)>>8 & 0xff }
@@ -825,19 +821,19 @@ static int si2165_set_frontend_dvbt(struct dvb_frontend *fe)
         struct si2165_state *state = fe->demodulator_priv;
         u32 dvb_rate = 0;
         u16 bw10k;
+        u32 bw_hz = p->bandwidth_hz;
 
         dprintk("%s: called\n", __func__);
 
         if (!state->has_dvbt)
                 return -EINVAL;
 
-        if (p->bandwidth_hz > 0) {
-                dvb_rate = p->bandwidth_hz * 8 / 7;
-                bw10k = p->bandwidth_hz / 10000;
-        } else {
-                dvb_rate = 8 * 8 / 7;
-                bw10k = 800;
-        }
+        /* no bandwidth auto-detection */
+        if (bw_hz == 0)
+                return -EINVAL;
+
+        dvb_rate = bw_hz * 8 / 7;
+        bw10k = bw_hz / 10000;
 
         ret = si2165_adjust_pll_divl(state, 12);
         if (ret < 0)
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 756650f154ab..3d171b0e00c2 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -1568,9 +1568,9 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe)
         return DVBFE_ALGO_SEARCH_ERROR;
 }
 
-static int stb0899_get_frontend(struct dvb_frontend *fe)
+static int stb0899_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stb0899_state *state             = fe->demodulator_priv;
         struct stb0899_internal *internal       = &state->internal;
 
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index c978c801c7aa..b9c2511bf019 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -346,7 +346,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
 
         if (fe->ops.get_frontend) {
                 dprintk(verbose, FE_DEBUG, 1, "Get frontend parameters");
-                fe->ops.get_frontend(fe);
+                fe->ops.get_frontend(fe, p);
         }
         srate = p->symbol_rate;
 
diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
index 75b4d8b25657..81b27b7c0c96 100644
--- a/drivers/media/dvb-frontends/stv0297.c
+++ b/drivers/media/dvb-frontends/stv0297.c
@@ -615,9 +615,9 @@ timeout:
         return 0;
 }
 
-static int stv0297_get_frontend(struct dvb_frontend *fe)
+static int stv0297_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stv0297_state *state = fe->demodulator_priv;
         int reg_00, reg_83;
 
diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
index a8177807fb65..7927fa925f2f 100644
--- a/drivers/media/dvb-frontends/stv0299.c
+++ b/drivers/media/dvb-frontends/stv0299.c
@@ -422,7 +422,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
         if (debug_legacy_dish_switch)
                 printk ("%s switch command: 0x%04lx\n",__func__, cmd);
 
-        nexttime = ktime_get_real();
+        nexttime = ktime_get_boottime();
         if (debug_legacy_dish_switch)
                 tv[0] = nexttime;
         stv0299_writeregI (state, 0x0c, reg0x0c | 0x50); /* set LNB to 18V */
@@ -431,7 +431,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
 
         for (i=0; i<9; i++) {
                 if (debug_legacy_dish_switch)
-                        tv[i+1] = ktime_get_real();
+                        tv[i+1] = ktime_get_boottime();
                 if((cmd & 0x01) != last) {
                         /* set voltage to (last ? 13V : 18V) */
                         stv0299_writeregI (state, 0x0c, reg0x0c | (last ? lv_mask : 0x50));
@@ -602,9 +602,9 @@ static int stv0299_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int stv0299_get_frontend(struct dvb_frontend *fe)
+static int stv0299_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stv0299_state* state = fe->demodulator_priv;
         s32 derot_freq;
         int invval;
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index 44cb73f68af6..abc379aea713 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -1938,9 +1938,9 @@ static int stv0367ter_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
         return 0;
 }
 
-static int stv0367ter_get_frontend(struct dvb_frontend *fe)
+static int stv0367ter_get_frontend(struct dvb_frontend *fe,
+                                   struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stv0367_state *state = fe->demodulator_priv;
         struct stv0367ter_state *ter_state = state->ter_state;
         enum stv0367_ter_mode mode;
@@ -3146,9 +3146,9 @@ static int stv0367cab_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int stv0367cab_get_frontend(struct dvb_frontend *fe)
+static int stv0367cab_get_frontend(struct dvb_frontend *fe,
+                                   struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stv0367_state *state = fe->demodulator_priv;
         struct stv0367cab_state *cab_state = state->cab_state;
 
diff --git a/drivers/media/dvb-frontends/stv0900_core.c b/drivers/media/dvb-frontends/stv0900_core.c
index fe31dd541955..28239b1fd954 100644
--- a/drivers/media/dvb-frontends/stv0900_core.c
+++ b/drivers/media/dvb-frontends/stv0900_core.c
@@ -1859,9 +1859,9 @@ static int stv0900_sleep(struct dvb_frontend *fe)
         return 0;
 }
 
-static int stv0900_get_frontend(struct dvb_frontend *fe)
+static int stv0900_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct stv0900_state *state = fe->demodulator_priv;
         struct stv0900_internal *intp = state->internal;
         enum fe_stv0900_demod_num demod = state->demod;
diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index e66154e5c1d7..a62c01e454f5 100644
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -355,7 +355,7 @@ static struct dvb_tuner_ops stv6110x_ops = {
         .release                = stv6110x_release
 };
 
-static struct stv6110x_devctl stv6110x_ctl = {
+static const struct stv6110x_devctl stv6110x_ctl = {
         .tuner_init             = stv6110x_init,
         .tuner_sleep            = stv6110x_sleep,
         .tuner_set_mode         = stv6110x_set_mode,
@@ -369,7 +369,7 @@ static struct stv6110x_devctl stv6110x_ctl = {
         .tuner_get_status       = stv6110x_get_status,
 };
 
-struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
+const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
                                         const struct stv6110x_config *config,
                                         struct i2c_adapter *i2c)
 {
diff --git a/drivers/media/dvb-frontends/stv6110x.h b/drivers/media/dvb-frontends/stv6110x.h
index 9f7eb251aec3..696b6e5b9e7b 100644
--- a/drivers/media/dvb-frontends/stv6110x.h
+++ b/drivers/media/dvb-frontends/stv6110x.h
@@ -55,12 +55,12 @@ struct stv6110x_devctl {
 
 #if IS_REACHABLE(CONFIG_DVB_STV6110x)
 
-extern struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
+extern const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
                                                const struct stv6110x_config *config,
                                                struct i2c_adapter *i2c);
 
 #else
-static inline struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
+static inline const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
                                                       const struct stv6110x_config *config,
                                                       struct i2c_adapter *i2c)
 {
diff --git a/drivers/media/dvb-frontends/stv6110x_priv.h b/drivers/media/dvb-frontends/stv6110x_priv.h
index 0ec936a660a7..a993aba27b7e 100644
--- a/drivers/media/dvb-frontends/stv6110x_priv.h
+++ b/drivers/media/dvb-frontends/stv6110x_priv.h
@@ -70,7 +70,7 @@ struct stv6110x_state {
         const struct stv6110x_config    *config;
         u8                              regs[8];
 
-        struct stv6110x_devctl          *devctl;
+        const struct stv6110x_devctl    *devctl;
 };
 
 #endif /* __STV6110x_PRIV_H */
diff --git a/drivers/media/dvb-frontends/tc90522.c b/drivers/media/dvb-frontends/tc90522.c
index 456cdc7fb1e7..31cd32532387 100644
--- a/drivers/media/dvb-frontends/tc90522.c
+++ b/drivers/media/dvb-frontends/tc90522.c
@@ -201,10 +201,10 @@ static const enum fe_code_rate fec_conv_sat[] = {
         FEC_2_3, /* for 8PSK. (trellis code) */
 };
 
-static int tc90522s_get_frontend(struct dvb_frontend *fe)
+static int tc90522s_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *c)
 {
         struct tc90522_state *state;
-        struct dtv_frontend_properties *c;
         struct dtv_fe_stats *stats;
         int ret, i;
         int layers;
@@ -212,7 +212,6 @@ static int tc90522s_get_frontend(struct dvb_frontend *fe)
         u32 cndat;
 
         state = fe->demodulator_priv;
-        c = &fe->dtv_property_cache;
         c->delivery_system = SYS_ISDBS;
         c->symbol_rate = 28860000;
 
@@ -337,10 +336,10 @@ static const enum fe_modulation mod_conv[] = {
         DQPSK, QPSK, QAM_16, QAM_64, 0, 0, 0, 0
 };
 
-static int tc90522t_get_frontend(struct dvb_frontend *fe)
+static int tc90522t_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *c)
 {
         struct tc90522_state *state;
-        struct dtv_frontend_properties *c;
         struct dtv_fe_stats *stats;
         int ret, i;
         int layers;
@@ -348,7 +347,6 @@ static int tc90522t_get_frontend(struct dvb_frontend *fe)
         u32 cndat;
 
         state = fe->demodulator_priv;
-        c = &fe->dtv_property_cache;
         c->delivery_system = SYS_ISDBT;
         c->bandwidth_hz = 6000000;
         mode = 1;
diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
index a684424e665a..806c56691ca5 100644
--- a/drivers/media/dvb-frontends/tda10021.c
+++ b/drivers/media/dvb-frontends/tda10021.c
@@ -387,9 +387,9 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int tda10021_get_frontend(struct dvb_frontend *fe)
+static int tda10021_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda10021_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
index 44a55656093f..3b8c7e499d0d 100644
--- a/drivers/media/dvb-frontends/tda10023.c
+++ b/drivers/media/dvb-frontends/tda10023.c
@@ -457,9 +457,9 @@ static int tda10023_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int tda10023_get_frontend(struct dvb_frontend *fe)
+static int tda10023_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda10023_state* state = fe->demodulator_priv;
         int sync,inv;
         s8 afc = 0;
diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
index 8451086c563f..c2bf89d0b0b0 100644
--- a/drivers/media/dvb-frontends/tda10048.c
+++ b/drivers/media/dvb-frontends/tda10048.c
@@ -1028,9 +1028,9 @@ static int tda10048_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
         return 0;
 }
 
-static int tda10048_get_frontend(struct dvb_frontend *fe)
+static int tda10048_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda10048_state *state = fe->demodulator_priv;
 
         dprintk(1, "%s()\n", __func__);
diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index c6abeb4fba9d..b89848313fb9 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -899,9 +899,9 @@ static int tda1004x_set_fe(struct dvb_frontend *fe)
         return 0;
 }
 
-static int tda1004x_get_fe(struct dvb_frontend *fe)
+static int tda1004x_get_fe(struct dvb_frontend *fe,
+                           struct dtv_frontend_properties *fe_params)
 {
-        struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
         struct tda1004x_state* state = fe->demodulator_priv;
         int status;
 
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 119d47596ac8..37ebeef2bbd0 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -701,11 +701,11 @@ error:
         return ret;
 }
 
-static int tda10071_get_frontend(struct dvb_frontend *fe)
+static int tda10071_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *c)
 {
         struct tda10071_dev *dev = fe->demodulator_priv;
         struct i2c_client *client = dev->client;
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret, i;
         u8 buf[5], tmp;
 
diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
index 95a33e187f8e..31d0acb54fe8 100644
--- a/drivers/media/dvb-frontends/tda10086.c
+++ b/drivers/media/dvb-frontends/tda10086.c
@@ -459,9 +459,9 @@ static int tda10086_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int tda10086_get_frontend(struct dvb_frontend *fe)
+static int tda10086_get_frontend(struct dvb_frontend *fe,
+                                 struct dtv_frontend_properties *fe_params)
 {
-        struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
         struct tda10086_state* state = fe->demodulator_priv;
         u8 val;
         int tmp;
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index 796543fa2c8d..9072d6463094 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -342,9 +342,9 @@ static int tda8083_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int tda8083_get_frontend(struct dvb_frontend *fe)
+static int tda8083_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda8083_state* state = fe->demodulator_priv;
 
         /*  FIXME: get symbolrate & frequency offset...*/
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 7979e5d6498b..14b410ffe612 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -712,6 +712,10 @@ static int ts2020_remove(struct i2c_client *client)
 
         dev_dbg(&client->dev, "\n");
 
+        /* stop statistics polling */
+        if (!dev->dont_poll)
+                cancel_delayed_work_sync(&dev->stat_work);
+
         regmap_exit(dev->regmap);
         kfree(dev);
         return 0;
diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
index aacfdda3e005..b09fe88c40f8 100644
--- a/drivers/media/dvb-frontends/ves1820.c
+++ b/drivers/media/dvb-frontends/ves1820.c
@@ -312,9 +312,9 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int ves1820_get_frontend(struct dvb_frontend *fe)
+static int ves1820_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct ves1820_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
index 526952396422..ed113e216e14 100644
--- a/drivers/media/dvb-frontends/ves1x93.c
+++ b/drivers/media/dvb-frontends/ves1x93.c
@@ -406,9 +406,9 @@ static int ves1x93_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int ves1x93_get_frontend(struct dvb_frontend *fe)
+static int ves1x93_get_frontend(struct dvb_frontend *fe,
+                                struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct ves1x93_state* state = fe->demodulator_priv;
         int afc;
 
diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
index ef9764a02d4c..1832c2f7695c 100644
--- a/drivers/media/dvb-frontends/zl10353.c
+++ b/drivers/media/dvb-frontends/zl10353.c
@@ -371,9 +371,9 @@ static int zl10353_set_parameters(struct dvb_frontend *fe)
         return 0;
 }
 
-static int zl10353_get_parameters(struct dvb_frontend *fe)
+static int zl10353_get_parameters(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *c)
 {
-        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct zl10353_state *state = fe->demodulator_priv;
         int s6, s9;
         u16 tps;
diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index 7e9cbf757e95..fb7ed730d932 100644
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client,
                 if (!client->dev.platform_data) {
                         dev_err(&client->dev,
                                 "Neither DT not platform data provided\n");
-                        return EINVAL;
+                        return -EINVAL;
                 }
                 flash->platform_data = client->dev.platform_data;
         }
diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index 471fd23b5c5c..bd822f032b08 100644
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -103,12 +103,14 @@ struct adv7511_state {
         u32 ycbcr_enc;
         u32 quantization;
         u32 xfer_func;
+        u32 content_type;
         /* controls */
         struct v4l2_ctrl *hdmi_mode_ctrl;
         struct v4l2_ctrl *hotplug_ctrl;
         struct v4l2_ctrl *rx_sense_ctrl;
         struct v4l2_ctrl *have_edid0_ctrl;
         struct v4l2_ctrl *rgb_quantization_range_ctrl;
+        struct v4l2_ctrl *content_type_ctrl;
         struct i2c_client *i2c_edid;
         struct i2c_client *i2c_pktmem;
         struct adv7511_state_edid edid;
@@ -400,6 +402,16 @@ static int adv7511_s_ctrl(struct v4l2_ctrl *ctrl)
         }
         if (state->rgb_quantization_range_ctrl == ctrl)
                 return adv7511_set_rgb_quantization_mode(sd, ctrl);
+        if (state->content_type_ctrl == ctrl) {
+                u8 itc, cn;
+
+                state->content_type = ctrl->val;
+                itc = state->content_type != V4L2_DV_IT_CONTENT_TYPE_NO_ITC;
+                cn = itc ? state->content_type : V4L2_DV_IT_CONTENT_TYPE_GRAPHICS;
+                adv7511_wr_and_or(sd, 0x57, 0x7f, itc << 7);
+                adv7511_wr_and_or(sd, 0x59, 0xcf, cn << 4);
+                return 0;
+        }
 
         return -EINVAL;
 }
@@ -1002,6 +1014,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd,
         u8 y = HDMI_COLORSPACE_RGB;
         u8 q = HDMI_QUANTIZATION_RANGE_DEFAULT;
         u8 yq = HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
+        u8 itc = state->content_type != V4L2_DV_IT_CONTENT_TYPE_NO_ITC;
+        u8 cn = itc ? state->content_type : V4L2_DV_IT_CONTENT_TYPE_GRAPHICS;
 
         if (format->pad != 0)
                 return -EINVAL;
@@ -1115,8 +1129,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd,
         adv7511_wr_and_or(sd, 0x4a, 0xbf, 0);
         adv7511_wr_and_or(sd, 0x55, 0x9f, y << 5);
         adv7511_wr_and_or(sd, 0x56, 0x3f, c << 6);
-        adv7511_wr_and_or(sd, 0x57, 0x83, (ec << 4) | (q << 2));
-        adv7511_wr_and_or(sd, 0x59, 0x3f, yq << 6);
+        adv7511_wr_and_or(sd, 0x57, 0x83, (ec << 4) | (q << 2) | (itc << 7));
+        adv7511_wr_and_or(sd, 0x59, 0x0f, (yq << 6) | (cn << 4));
         adv7511_wr_and_or(sd, 0x4a, 0xff, 1);
 
         return 0;
@@ -1161,12 +1175,23 @@ static void adv7511_dbg_dump_edid(int lvl, int debug, struct v4l2_subdev *sd, in
         }
 }
 
+static void adv7511_notify_no_edid(struct v4l2_subdev *sd)
+{
+        struct adv7511_state *state = get_adv7511_state(sd);
+        struct adv7511_edid_detect ed;
+
+        /* We failed to read the EDID, so send an event for this. */
+        ed.present = false;
+        ed.segment = adv7511_rd(sd, 0xc4);
+        v4l2_subdev_notify(sd, ADV7511_EDID_DETECT, (void *)&ed);
+        v4l2_ctrl_s_ctrl(state->have_edid0_ctrl, 0x0);
+}
+
 static void adv7511_edid_handler(struct work_struct *work)
 {
         struct delayed_work *dwork = to_delayed_work(work);
         struct adv7511_state *state = container_of(dwork, struct adv7511_state, edid_handler);
         struct v4l2_subdev *sd = &state->sd;
-        struct adv7511_edid_detect ed;
 
         v4l2_dbg(1, debug, sd, "%s:\n", __func__);
 
@@ -1191,9 +1216,7 @@ static void adv7511_edid_handler(struct work_struct *work)
         }
 
         /* We failed to read the EDID, so send an event for this. */
-        ed.present = false;
-        ed.segment = adv7511_rd(sd, 0xc4);
-        v4l2_subdev_notify(sd, ADV7511_EDID_DETECT, (void *)&ed);
+        adv7511_notify_no_edid(sd);
         v4l2_dbg(1, debug, sd, "%s: no edid found\n", __func__);
 }
 
@@ -1264,7 +1287,6 @@ static void adv7511_check_monitor_present_status(struct v4l2_subdev *sd)
         /* update read only ctrls */
         v4l2_ctrl_s_ctrl(state->hotplug_ctrl, adv7511_have_hotplug(sd) ? 0x1 : 0x0);
         v4l2_ctrl_s_ctrl(state->rx_sense_ctrl, adv7511_have_rx_sense(sd) ? 0x1 : 0x0);
-        v4l2_ctrl_s_ctrl(state->have_edid0_ctrl, state->edid.segments ? 0x1 : 0x0);
 
         if ((status & MASK_ADV7511_HPD_DETECT) && ((status & MASK_ADV7511_MSEN_DETECT) || state->edid.segments)) {
                 v4l2_dbg(1, debug, sd, "%s: hotplug and (rx-sense or edid)\n", __func__);
@@ -1294,6 +1316,7 @@ static void adv7511_check_monitor_present_status(struct v4l2_subdev *sd)
                 }
                 adv7511_s_power(sd, false);
                 memset(&state->edid, 0, sizeof(struct adv7511_state_edid));
+                adv7511_notify_no_edid(sd);
         }
 }
 
@@ -1370,6 +1393,7 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
                 }
                 /* one more segment read ok */
                 state->edid.segments = segment + 1;
+                v4l2_ctrl_s_ctrl(state->have_edid0_ctrl, 0x1);
                 if (((state->edid.data[0x7e] >> 1) + 1) > state->edid.segments) {
                         /* Request next EDID segment */
                         v4l2_dbg(1, debug, sd, "%s: request segment %d\n", __func__, state->edid.segments);
@@ -1389,7 +1413,6 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
                 ed.present = true;
                 ed.segment = 0;
                 state->edid_detect_counter++;
-                v4l2_ctrl_s_ctrl(state->have_edid0_ctrl, state->edid.segments ? 0x1 : 0x0);
                 v4l2_subdev_notify(sd, ADV7511_EDID_DETECT, (void *)&ed);
                 return ed.present;
         }
@@ -1470,6 +1493,10 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
                 v4l2_ctrl_new_std_menu(hdl, &adv7511_ctrl_ops,
                         V4L2_CID_DV_TX_RGB_RANGE, V4L2_DV_RGB_RANGE_FULL,
                         0, V4L2_DV_RGB_RANGE_AUTO);
+        state->content_type_ctrl =
+                v4l2_ctrl_new_std_menu(hdl, &adv7511_ctrl_ops,
+                        V4L2_CID_DV_TX_IT_CONTENT_TYPE, V4L2_DV_IT_CONTENT_TYPE_NO_ITC,
+                        0, V4L2_DV_IT_CONTENT_TYPE_NO_ITC);
         sd->ctrl_handler = hdl;
         if (hdl->error) {
                 err = hdl->error;
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index f8dd7505b529..d35e0ba8b269 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -207,71 +207,22 @@ static bool adv76xx_has_afe(struct adv76xx_state *state)
         return state->info->has_afe;
 }
 
-/* Supported CEA and DMT timings */
-static const struct v4l2_dv_timings adv76xx_timings[] = {
-        V4L2_DV_BT_CEA_720X480P59_94,
-        V4L2_DV_BT_CEA_720X576P50,
-        V4L2_DV_BT_CEA_1280X720P24,
-        V4L2_DV_BT_CEA_1280X720P25,
-        V4L2_DV_BT_CEA_1280X720P50,
-        V4L2_DV_BT_CEA_1280X720P60,
-        V4L2_DV_BT_CEA_1920X1080P24,
-        V4L2_DV_BT_CEA_1920X1080P25,
-        V4L2_DV_BT_CEA_1920X1080P30,
-        V4L2_DV_BT_CEA_1920X1080P50,
-        V4L2_DV_BT_CEA_1920X1080P60,
-
-        /* sorted by DMT ID */
-        V4L2_DV_BT_DMT_640X350P85,
-        V4L2_DV_BT_DMT_640X400P85,
-        V4L2_DV_BT_DMT_720X400P85,
-        V4L2_DV_BT_DMT_640X480P60,
-        V4L2_DV_BT_DMT_640X480P72,
-        V4L2_DV_BT_DMT_640X480P75,
-        V4L2_DV_BT_DMT_640X480P85,
-        V4L2_DV_BT_DMT_800X600P56,
-        V4L2_DV_BT_DMT_800X600P60,
-        V4L2_DV_BT_DMT_800X600P72,
-        V4L2_DV_BT_DMT_800X600P75,
-        V4L2_DV_BT_DMT_800X600P85,
-        V4L2_DV_BT_DMT_848X480P60,
-        V4L2_DV_BT_DMT_1024X768P60,
-        V4L2_DV_BT_DMT_1024X768P70,
-        V4L2_DV_BT_DMT_1024X768P75,
-        V4L2_DV_BT_DMT_1024X768P85,
-        V4L2_DV_BT_DMT_1152X864P75,
-        V4L2_DV_BT_DMT_1280X768P60_RB,
-        V4L2_DV_BT_DMT_1280X768P60,
-        V4L2_DV_BT_DMT_1280X768P75,
-        V4L2_DV_BT_DMT_1280X768P85,
-        V4L2_DV_BT_DMT_1280X800P60_RB,
-        V4L2_DV_BT_DMT_1280X800P60,
-        V4L2_DV_BT_DMT_1280X800P75,
-        V4L2_DV_BT_DMT_1280X800P85,
-        V4L2_DV_BT_DMT_1280X960P60,
-        V4L2_DV_BT_DMT_1280X960P85,
-        V4L2_DV_BT_DMT_1280X1024P60,
-        V4L2_DV_BT_DMT_1280X1024P75,
-        V4L2_DV_BT_DMT_1280X1024P85,
-        V4L2_DV_BT_DMT_1360X768P60,
-        V4L2_DV_BT_DMT_1400X1050P60_RB,
-        V4L2_DV_BT_DMT_1400X1050P60,
-        V4L2_DV_BT_DMT_1400X1050P75,
-        V4L2_DV_BT_DMT_1400X1050P85,
-        V4L2_DV_BT_DMT_1440X900P60_RB,
-        V4L2_DV_BT_DMT_1440X900P60,
-        V4L2_DV_BT_DMT_1600X1200P60,
-        V4L2_DV_BT_DMT_1680X1050P60_RB,
-        V4L2_DV_BT_DMT_1680X1050P60,
-        V4L2_DV_BT_DMT_1792X1344P60,
-        V4L2_DV_BT_DMT_1856X1392P60,
-        V4L2_DV_BT_DMT_1920X1200P60_RB,
-        V4L2_DV_BT_DMT_1366X768P60_RB,
-        V4L2_DV_BT_DMT_1366X768P60,
-        V4L2_DV_BT_DMT_1920X1080P60,
-        { },
+/* Unsupported timings. This device cannot support 720p30. */
+static const struct v4l2_dv_timings adv76xx_timings_exceptions[] = {
+        V4L2_DV_BT_CEA_1280X720P30,
+        { }
 };
 
+static bool adv76xx_check_dv_timings(const struct v4l2_dv_timings *t, void *hdl)
+{
+        int i;
+
+        for (i = 0; adv76xx_timings_exceptions[i].bt.width; i++)
+                if (v4l2_match_dv_timings(t, adv76xx_timings_exceptions + i, 0, false))
+                        return false;
+        return true;
+}
+
 struct adv76xx_video_standards {
         struct v4l2_dv_timings timings;
         u8 vid_std;
@@ -806,6 +757,36 @@ static inline bool is_digital_input(struct v4l2_subdev *sd)
                state->selected_input == ADV7604_PAD_HDMI_PORT_D;
 }
 
+static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = {
+        .type = V4L2_DV_BT_656_1120,
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+                        V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                        V4L2_DV_BT_CAP_CUSTOM)
+};
+
+static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = {
+        .type = V4L2_DV_BT_656_1120,
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+                        V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                        V4L2_DV_BT_CAP_CUSTOM)
+};
+
+static inline const struct v4l2_dv_timings_cap *
+adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd)
+{
+        return is_digital_input(sd) ? &adv76xx_timings_cap_digital :
+                                      &adv7604_timings_cap_analog;
+}
+
+
 /* ----------------------------------------------------------------------- */
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -1216,6 +1197,20 @@ static int adv76xx_s_ctrl(struct v4l2_ctrl *ctrl)
         return -EINVAL;
 }
 
+static int adv76xx_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct v4l2_subdev *sd =
+                &container_of(ctrl->handler, struct adv76xx_state, hdl)->sd;
+
+        if (ctrl->id == V4L2_CID_DV_RX_IT_CONTENT_TYPE) {
+                ctrl->val = V4L2_DV_IT_CONTENT_TYPE_NO_ITC;
+                if ((io_read(sd, 0x60) & 1) && (infoframe_read(sd, 0x03) & 0x80))
+                        ctrl->val = (infoframe_read(sd, 0x05) >> 4) & 3;
+                return 0;
+        }
+        return -EINVAL;
+}
+
 /* ----------------------------------------------------------------------- */
 
 static inline bool no_power(struct v4l2_subdev *sd)
@@ -1330,17 +1325,23 @@ static int stdi2dv_timings(struct v4l2_subdev *sd,
         u32 pix_clk;
         int i;
 
-        for (i = 0; adv76xx_timings[i].bt.height; i++) {
-                if (vtotal(&adv76xx_timings[i].bt) != stdi->lcf + 1)
+        for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) {
+                const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt;
+
+                if (!v4l2_valid_dv_timings(&v4l2_dv_timings_presets[i],
+                                           adv76xx_get_dv_timings_cap(sd),
+                                           adv76xx_check_dv_timings, NULL))
+                        continue;
+                if (vtotal(bt) != stdi->lcf + 1)
                         continue;
-                if (adv76xx_timings[i].bt.vsync != stdi->lcvs)
+                if (bt->vsync != stdi->lcvs)
                         continue;
 
-                pix_clk = hfreq * htotal(&adv76xx_timings[i].bt);
+                pix_clk = hfreq * htotal(bt);
 
-                if ((pix_clk < adv76xx_timings[i].bt.pixelclock + 1000000) &&
-                    (pix_clk > adv76xx_timings[i].bt.pixelclock - 1000000)) {
-                        *timings = adv76xx_timings[i];
+                if ((pix_clk < bt->pixelclock + 1000000) &&
+                    (pix_clk > bt->pixelclock - 1000000)) {
+                        *timings = v4l2_dv_timings_presets[i];
                         return 0;
                 }
         }
@@ -1425,15 +1426,11 @@ static int adv76xx_enum_dv_timings(struct v4l2_subdev *sd,
 {
         struct adv76xx_state *state = to_state(sd);
 
-        if (timings->index >= ARRAY_SIZE(adv76xx_timings) - 1)
-                return -EINVAL;
-
         if (timings->pad >= state->source_pad)
                 return -EINVAL;
 
-        memset(timings->reserved, 0, sizeof(timings->reserved));
-        timings->timings = adv76xx_timings[timings->index];
-        return 0;
+        return v4l2_enum_dv_timings_cap(timings,
+                adv76xx_get_dv_timings_cap(sd), adv76xx_check_dv_timings, NULL);
 }
 
 static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd,
@@ -1444,29 +1441,7 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd,
         if (cap->pad >= state->source_pad)
                 return -EINVAL;
 
-        cap->type = V4L2_DV_BT_656_1120;
-        cap->bt.max_width = 1920;
-        cap->bt.max_height = 1200;
-        cap->bt.min_pixelclock = 25000000;
-
-        switch (cap->pad) {
-        case ADV76XX_PAD_HDMI_PORT_A:
-        case ADV7604_PAD_HDMI_PORT_B:
-        case ADV7604_PAD_HDMI_PORT_C:
-        case ADV7604_PAD_HDMI_PORT_D:
-                cap->bt.max_pixelclock = 225000000;
-                break;
-        case ADV7604_PAD_VGA_RGB:
-        case ADV7604_PAD_VGA_COMP:
-        default:
-                cap->bt.max_pixelclock = 170000000;
-                break;
-        }
-
-        cap->bt.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
-                         V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT;
-        cap->bt.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
-                V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM;
+        *cap = *adv76xx_get_dv_timings_cap(sd);
         return 0;
 }
 
@@ -1475,15 +1450,9 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd,
 static void adv76xx_fill_optional_dv_timings_fields(struct v4l2_subdev *sd,
                 struct v4l2_dv_timings *timings)
 {
-        int i;
-
-        for (i = 0; adv76xx_timings[i].bt.width; i++) {
-                if (v4l2_match_dv_timings(timings, &adv76xx_timings[i],
-                                is_digital_input(sd) ? 250000 : 1000000, false)) {
-                        *timings = adv76xx_timings[i];
-                        break;
-                }
-        }
+        v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd),
+                        is_digital_input(sd) ? 250000 : 1000000,
+                        adv76xx_check_dv_timings, NULL);
 }
 
 static unsigned int adv7604_read_hdmi_pixelclock(struct v4l2_subdev *sd)
@@ -1651,12 +1620,9 @@ static int adv76xx_s_dv_timings(struct v4l2_subdev *sd,
 
         bt = &timings->bt;
 
-        if ((is_analog_input(sd) && bt->pixelclock > 170000000) ||
-                        (is_digital_input(sd) && bt->pixelclock > 225000000)) {
-                v4l2_dbg(1, debug, sd, "%s: pixelclock out of range %d\n",
-                                __func__, (u32)bt->pixelclock);
+        if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd),
+                                   adv76xx_check_dv_timings, NULL))
                 return -ERANGE;
-        }
 
         adv76xx_fill_optional_dv_timings_fields(sd, timings);
 
@@ -1884,6 +1850,26 @@ static int adv76xx_get_format(struct v4l2_subdev *sd,
         return 0;
 }
 
+static int adv76xx_get_selection(struct v4l2_subdev *sd,
+                                 struct v4l2_subdev_pad_config *cfg,
+                                 struct v4l2_subdev_selection *sel)
+{
+        struct adv76xx_state *state = to_state(sd);
+
+        if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)
+                return -EINVAL;
+        /* Only CROP, CROP_DEFAULT and CROP_BOUNDS are supported */
+        if (sel->target > V4L2_SEL_TGT_CROP_BOUNDS)
+                return -EINVAL;
+
+        sel->r.left     = 0;
+        sel->r.top      = 0;
+        sel->r.width    = state->timings.bt.width;
+        sel->r.height   = state->timings.bt.height;
+
+        return 0;
+}
+
 static int adv76xx_set_format(struct v4l2_subdev *sd,
                               struct v4l2_subdev_pad_config *cfg,
                               struct v4l2_subdev_format *format)
@@ -2381,6 +2367,7 @@ static int adv76xx_subscribe_event(struct v4l2_subdev *sd,
 
 static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = {
         .s_ctrl = adv76xx_s_ctrl,
+        .g_volatile_ctrl = adv76xx_g_volatile_ctrl,
 };
 
 static const struct v4l2_subdev_core_ops adv76xx_core_ops = {
@@ -2404,6 +2391,7 @@ static const struct v4l2_subdev_video_ops adv76xx_video_ops = {
 
 static const struct v4l2_subdev_pad_ops adv76xx_pad_ops = {
         .enum_mbus_code = adv76xx_enum_mbus_code,
+        .get_selection = adv76xx_get_selection,
         .get_fmt = adv76xx_get_format,
         .set_fmt = adv76xx_set_format,
         .get_edid = adv76xx_get_edid,
@@ -2799,6 +2787,7 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
         struct device_node *endpoint;
         struct device_node *np;
         unsigned int flags;
+        int ret;
         u32 v;
 
         np = state->i2c_clients[ADV76XX_PAGE_IO]->dev.of_node;
@@ -2808,7 +2797,11 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
         if (!endpoint)
                 return -EINVAL;
 
-        v4l2_of_parse_endpoint(endpoint, &bus_cfg);
+        ret = v4l2_of_parse_endpoint(endpoint, &bus_cfg);
+        if (ret) {
+                of_node_put(endpoint);
+                return ret;
+        }
 
         if (!of_property_read_u32(endpoint, "default-input", &v))
                 state->pdata.default_input = v;
@@ -3010,6 +3003,7 @@ static int adv76xx_probe(struct i2c_client *client,
                 V4L2_DV_BT_CEA_640X480P59_94;
         struct adv76xx_state *state;
         struct v4l2_ctrl_handler *hdl;
+        struct v4l2_ctrl *ctrl;
         struct v4l2_subdev *sd;
         unsigned int i;
         unsigned int val, val2;
@@ -3141,6 +3135,11 @@ static int adv76xx_probe(struct i2c_client *client,
                         V4L2_CID_SATURATION, 0, 255, 1, 128);
         v4l2_ctrl_new_std(hdl, &adv76xx_ctrl_ops,
                         V4L2_CID_HUE, 0, 128, 1, 0);
+        ctrl = v4l2_ctrl_new_std_menu(hdl, &adv76xx_ctrl_ops,
+                        V4L2_CID_DV_RX_IT_CONTENT_TYPE, V4L2_DV_IT_CONTENT_TYPE_NO_ITC,
+                        0, V4L2_DV_IT_CONTENT_TYPE_NO_ITC);
+        if (ctrl)
+                ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         /* private controls */
         state->detect_tx_5v_ctrl = v4l2_ctrl_new_std(hdl, NULL,
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 5fbb788e7b59..7ccb85d45224 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -1359,6 +1359,19 @@ static int adv7842_s_ctrl(struct v4l2_ctrl *ctrl)
         return -EINVAL;
 }
 
+static int adv7842_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct v4l2_subdev *sd = to_sd(ctrl);
+
+        if (ctrl->id == V4L2_CID_DV_RX_IT_CONTENT_TYPE) {
+                ctrl->val = V4L2_DV_IT_CONTENT_TYPE_NO_ITC;
+                if ((io_read(sd, 0x60) & 1) && (infoframe_read(sd, 0x03) & 0x80))
+                        ctrl->val = (infoframe_read(sd, 0x05) >> 4) & 3;
+                return 0;
+        }
+        return -EINVAL;
+}
+
 static inline bool no_power(struct v4l2_subdev *sd)
 {
         return io_read(sd, 0x0c) & 0x24;
@@ -3022,6 +3035,7 @@ static int adv7842_subscribe_event(struct v4l2_subdev *sd,
 
 static const struct v4l2_ctrl_ops adv7842_ctrl_ops = {
         .s_ctrl = adv7842_s_ctrl,
+        .g_volatile_ctrl = adv7842_g_volatile_ctrl,
 };
 
 static const struct v4l2_subdev_core_ops adv7842_core_ops = {
@@ -3196,6 +3210,7 @@ static int adv7842_probe(struct i2c_client *client,
                 V4L2_DV_BT_CEA_640X480P59_94;
         struct adv7842_platform_data *pdata = client->dev.platform_data;
         struct v4l2_ctrl_handler *hdl;
+        struct v4l2_ctrl *ctrl;
         struct v4l2_subdev *sd;
         u16 rev;
         int err;
@@ -3261,6 +3276,11 @@ static int adv7842_probe(struct i2c_client *client,
                           V4L2_CID_SATURATION, 0, 255, 1, 128);
         v4l2_ctrl_new_std(hdl, &adv7842_ctrl_ops,
                           V4L2_CID_HUE, 0, 128, 1, 0);
+        ctrl = v4l2_ctrl_new_std_menu(hdl, &adv7842_ctrl_ops,
+                        V4L2_CID_DV_RX_IT_CONTENT_TYPE, V4L2_DV_IT_CONTENT_TYPE_NO_ITC,
+                        0, V4L2_DV_IT_CONTENT_TYPE_NO_ITC);
+        if (ctrl)
+                ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         /* custom controls */
         state->detect_tx_5v_ctrl = v4l2_ctrl_new_std(hdl, NULL,
diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index a84561d0d4a8..e016626ebf89 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -688,6 +688,9 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         int msp_revision;
         int msp_product, msp_prod_hi, msp_prod_lo;
         int msp_rom;
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        int ret;
+#endif
 
         if (!id)
                 strlcpy(client->name, "msp3400", sizeof(client->name));
@@ -704,6 +707,17 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         sd = &state->sd;
         v4l2_i2c_subdev_init(sd, client, &msp_ops);
 
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        state->pads[IF_AUD_DEC_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+        state->pads[IF_AUD_DEC_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE;
+
+        sd->entity.function = MEDIA_ENT_F_IF_AUD_DECODER;
+
+        ret = media_entity_pads_init(&sd->entity, 2, state->pads);
+        if (ret < 0)
+                return ret;
+#endif
+
         state->v4l2_std = V4L2_STD_NTSC;
         state->detected_std = V4L2_STD_ALL;
         state->audmode = V4L2_TUNER_MODE_STEREO;
diff --git a/drivers/media/i2c/msp3400-driver.h b/drivers/media/i2c/msp3400-driver.h
index 6cae21366ed5..a8702aca187a 100644
--- a/drivers/media/i2c/msp3400-driver.h
+++ b/drivers/media/i2c/msp3400-driver.h
@@ -7,6 +7,7 @@
 #include <media/drv-intf/msp3400.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-mc.h>
 
 /* ---------------------------------------------------------------------- */
 
@@ -102,6 +103,10 @@ struct msp_state {
         wait_queue_head_t    wq;
         unsigned int         restart:1;
         unsigned int         watch_stereo:1;
+
+#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
+        struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS];
+#endif
 };
 
 static inline struct msp_state *to_state(struct v4l2_subdev *sd)
diff --git a/drivers/media/i2c/mt9v011.c b/drivers/media/i2c/mt9v011.c
index b9fea11d6b0b..9ed1b26b6549 100644
--- a/drivers/media/i2c/mt9v011.c
+++ b/drivers/media/i2c/mt9v011.c
@@ -50,6 +50,9 @@ MODULE_PARM_DESC(debug, "Debug level (0-2)");
 
 struct mt9v011 {
         struct v4l2_subdev sd;
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_pad pad;
+#endif
         struct v4l2_ctrl_handler ctrls;
         unsigned width, height;
         unsigned xtal;
@@ -493,6 +496,9 @@ static int mt9v011_probe(struct i2c_client *c,
         u16 version;
         struct mt9v011 *core;
         struct v4l2_subdev *sd;
+#ifdef CONFIG_MEDIA_CONTROLLER
+        int ret;
+#endif
 
         /* Check if the adapter supports the needed features */
         if (!i2c_check_functionality(c->adapter,
@@ -506,6 +512,15 @@ static int mt9v011_probe(struct i2c_client *c,
         sd = &core->sd;
         v4l2_i2c_subdev_init(sd, c, &mt9v011_ops);
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+        core->pad.flags = MEDIA_PAD_FL_SOURCE;
+        sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
+
+        ret = media_entity_pads_init(&sd->entity, 1, &core->pad);
+        if (ret < 0)
+                return ret;
+#endif
+
         /* Check if the sensor is really a MT9V011 */
         version = mt9v011_read(sd, R00_MT9V011_CHIP_VERSION);
         if ((version != MT9V011_VERSION) &&
diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index 2e1d116a64e7..501b37039449 100644
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -14,6 +14,7 @@
 
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
 #include <linux/mutex.h>
@@ -251,6 +252,8 @@ struct mt9v032 {
 
         struct regmap *regmap;
         struct clk *clk;
+        struct gpio_desc *reset_gpio;
+        struct gpio_desc *standby_gpio;
 
         struct mt9v032_platform_data *pdata;
         const struct mt9v032_model_info *model;
@@ -312,16 +315,31 @@ static int mt9v032_power_on(struct mt9v032 *mt9v032)
         struct regmap *map = mt9v032->regmap;
         int ret;
 
+        if (mt9v032->reset_gpio)
+                gpiod_set_value_cansleep(mt9v032->reset_gpio, 1);
+
         ret = clk_set_rate(mt9v032->clk, mt9v032->sysclk);
         if (ret < 0)
                 return ret;
 
+        /* System clock has to be enabled before releasing the reset */
         ret = clk_prepare_enable(mt9v032->clk);
         if (ret)
                 return ret;
 
         udelay(1);
 
+        if (mt9v032->reset_gpio) {
+                gpiod_set_value_cansleep(mt9v032->reset_gpio, 0);
+
+                /* After releasing reset we need to wait 10 clock cycles
+                 * before accessing the sensor over I2C. As the minimum SYSCLK
+                 * frequency is 13MHz, waiting 1µs will be enough in the worst
+                 * case.
+                 */
+                udelay(1);
+        }
+
         /* Reset the chip and stop data read out */
         ret = regmap_write(map, MT9V032_RESET, 1);
         if (ret < 0)
@@ -954,6 +972,16 @@ static int mt9v032_probe(struct i2c_client *client,
         if (IS_ERR(mt9v032->clk))
                 return PTR_ERR(mt9v032->clk);
 
+        mt9v032->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset",
+                                                      GPIOD_OUT_HIGH);
+        if (IS_ERR(mt9v032->reset_gpio))
+                return PTR_ERR(mt9v032->reset_gpio);
+
+        mt9v032->standby_gpio = devm_gpiod_get_optional(&client->dev, "standby",
+                                                        GPIOD_OUT_LOW);
+        if (IS_ERR(mt9v032->standby_gpio))
+                return PTR_ERR(mt9v032->standby_gpio);
+
         mutex_init(&mt9v032->power_lock);
         mt9v032->pdata = pdata;
         mt9v032->model = (const void *)did->driver_data;
diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 02b9a3440557..1f999e9c0118 100644
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -1321,10 +1321,6 @@ static int ov2659_detect(struct v4l2_subdev *sd)
         }
         usleep_range(1000, 2000);
 
-        ret = ov2659_init(sd, 0);
-        if (ret < 0)
-                return ret;
-
         /* Check sensor revision */
         ret = ov2659_read(client, REG_SC_CHIP_ID_H, &pid);
         if (!ret)
@@ -1338,8 +1334,10 @@ static int ov2659_detect(struct v4l2_subdev *sd)
                         dev_err(&client->dev,
                                 "Sensor detection failed (%04X, %d)\n",
                                 id, ret);
-                else
+                else {
                         dev_info(&client->dev, "Found OV%04X sensor\n", id);
+                        ret = ov2659_init(sd, 0);
+                }
         }
 
         return ret;
diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c
index a0b3c9bde53d..be5a7fd4f076 100644
--- a/drivers/media/i2c/ov9650.c
+++ b/drivers/media/i2c/ov9650.c
@@ -1046,8 +1046,8 @@ static int ov965x_initialize_controls(struct ov965x *ov965x)
         ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false);
-        v4l2_ctrl_auto_cluster(3, &ctrls->auto_gain, 0, true);
-        v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 1, true);
+        v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true);
+        v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true);
         v4l2_ctrl_cluster(2, &ctrls->hflip);
 
         ov965x->sd.ctrl_handler = hdl;
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index 57b3d27993a4..08af58fb8e7d 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -1639,8 +1639,10 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state)
                 return 0;
         }
 
-        v4l2_of_parse_endpoint(node_ep, &ep);
+        ret = v4l2_of_parse_endpoint(node_ep, &ep);
         of_node_put(node_ep);
+        if (ret)
+                return ret;
 
         if (ep.bus_type != V4L2_MBUS_CSI2) {
                 dev_err(dev, "unsupported bus type\n");
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
index 7d65b36434b1..72ef9f936e6c 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
@@ -37,7 +37,6 @@ enum spi_direction {
         SPI_DIR_RX,
         SPI_DIR_TX
 };
-MODULE_DEVICE_TABLE(of, s5c73m3_spi_ids);
 
 static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len,
                                                         enum spi_direction dir)
diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index fc3a5a8e6c9c..db82ed05792e 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -1868,8 +1868,11 @@ static int s5k5baf_parse_device_node(struct s5k5baf *state, struct device *dev)
                 return -EINVAL;
         }
 
-        v4l2_of_parse_endpoint(node_ep, &ep);
+        ret = v4l2_of_parse_endpoint(node_ep, &ep);
         of_node_put(node_ep);
+        if (ret)
+                return ret;
+
         state->bus_type = ep.bus_type;
 
         switch (state->bus_type) {
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index 24d2b76dbe97..d2a1ce2bc7f5 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -46,6 +46,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-mc.h>
 #include <media/i2c/saa7115.h>
 #include <asm/div64.h>
 
@@ -74,6 +75,9 @@ enum saa711x_model {
 
 struct saa711x_state {
         struct v4l2_subdev sd;
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_pad pads[DEMOD_NUM_PADS];
+#endif
         struct v4l2_ctrl_handler hdl;
 
         struct {
@@ -1809,6 +1813,9 @@ static int saa711x_probe(struct i2c_client *client,
         struct saa7115_platform_data *pdata;
         int ident;
         char name[CHIP_VER_SIZE + 1];
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        int ret;
+#endif
 
         /* Check if the adapter supports the needed features */
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
@@ -1832,6 +1839,18 @@ static int saa711x_probe(struct i2c_client *client,
         sd = &state->sd;
         v4l2_i2c_subdev_init(sd, client, &saa711x_ops);
 
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+        state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
+        state->pads[DEMOD_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
+
+        sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
+
+        ret = media_entity_pads_init(&sd->entity, DEMOD_NUM_PADS, state->pads);
+        if (ret < 0)
+                return ret;
+#endif
+
         v4l_info(client, "%s found @ 0x%x (%s)\n", name,
                  client->addr << 1, client->adapter->name);
         hdl = &state->hdl;
diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index 2e14e52ba2e0..69becc358659 100644
--- a/drivers/media/i2c/soc_camera/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
@@ -632,7 +632,7 @@ static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
         .s_mbus_config  = mt9m001_s_mbus_config,
 };
 
-static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
+static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
         .g_skip_top_lines       = mt9m001_g_skip_top_lines,
 };
 
diff --git a/drivers/media/i2c/soc_camera/mt9t031.c b/drivers/media/i2c/soc_camera/mt9t031.c
index 3b6eeed2e2b9..5c8e3ffe3b27 100644
--- a/drivers/media/i2c/soc_camera/mt9t031.c
+++ b/drivers/media/i2c/soc_camera/mt9t031.c
@@ -728,7 +728,7 @@ static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
         .s_mbus_config  = mt9t031_s_mbus_config,
 };
 
-static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
+static const struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
         .g_skip_top_lines       = mt9t031_g_skip_top_lines,
 };
 
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index c2ba1fb3694d..2721e583bfa0 100644
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -860,7 +860,7 @@ static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
         .s_mbus_config  = mt9v022_s_mbus_config,
 };
 
-static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
+static const struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
         .g_skip_top_lines       = mt9v022_g_skip_top_lines,
 };
 
diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
index 3397eb99c67b..da7469bc6e56 100644
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -59,8 +59,7 @@ MODULE_LICENSE("GPL");
 #define EDID_NUM_BLOCKS_MAX 8
 #define EDID_BLOCK_SIZE 128
 
-/* Max transfer size done by I2C transfer functions */
-#define MAX_XFER_SIZE  (EDID_NUM_BLOCKS_MAX * EDID_BLOCK_SIZE + 2)
+#define I2C_MAX_XFER_SIZE  (EDID_BLOCK_SIZE + 2)
 
 static const struct v4l2_dv_timings_cap tc358743_timings_cap = {
         .type = V4L2_DV_BT_656_1120,
@@ -97,9 +96,6 @@ struct tc358743_state {
         /* edid  */
         u8 edid_blocks_written;
 
-        /* used by i2c_wr() */
-        u8 wr_data[MAX_XFER_SIZE];
-
         struct v4l2_dv_timings timings;
         u32 mbus_fmt_code;
 
@@ -149,13 +145,15 @@ static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
 {
         struct tc358743_state *state = to_state(sd);
         struct i2c_client *client = state->i2c_client;
-        u8 *data = state->wr_data;
         int err, i;
         struct i2c_msg msg;
+        u8 data[I2C_MAX_XFER_SIZE];
 
-        if ((2 + n) > sizeof(state->wr_data))
+        if ((2 + n) > I2C_MAX_XFER_SIZE) {
+                n = I2C_MAX_XFER_SIZE - 2;
                 v4l2_warn(sd, "i2c wr reg=%04x: len=%d is too big!\n",
                           reg, 2 + n);
+        }
 
         msg.addr = client->addr;
         msg.buf = data;
@@ -859,15 +857,16 @@ static void tc358743_format_change(struct v4l2_subdev *sd)
         if (tc358743_get_detected_timings(sd, &timings)) {
                 enable_stream(sd, false);
 
-                v4l2_dbg(1, debug, sd, "%s: Format changed. No signal\n",
+                v4l2_dbg(1, debug, sd, "%s: No signal\n",
                                 __func__);
         } else {
                 if (!v4l2_match_dv_timings(&state->timings, &timings, 0, false))
                         enable_stream(sd, false);
 
-                v4l2_print_dv_timings(sd->name,
-                                "tc358743_format_change: Format changed. New format: ",
-                                &timings, false);
+                if (debug)
+                        v4l2_print_dv_timings(sd->name,
+                                        "tc358743_format_change: New format: ",
+                                        &timings, false);
         }
 
         if (sd->devnode)
@@ -1581,6 +1580,7 @@ static int tc358743_s_edid(struct v4l2_subdev *sd,
 {
         struct tc358743_state *state = to_state(sd);
         u16 edid_len = edid->blocks * EDID_BLOCK_SIZE;
+        int i;
 
         v4l2_dbg(2, debug, sd, "%s, pad %d, start block %d, blocks %d\n",
                  __func__, edid->pad, edid->start_block, edid->blocks);
@@ -1606,7 +1606,8 @@ static int tc358743_s_edid(struct v4l2_subdev *sd,
                 return 0;
         }
 
-        i2c_wr(sd, EDID_RAM, edid->edid, edid_len);
+        for (i = 0; i < edid_len; i += EDID_BLOCK_SIZE)
+                i2c_wr(sd, EDID_RAM + i, edid->edid + i, EDID_BLOCK_SIZE);
 
         state->edid_blocks_written = edid->blocks;
 
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index 7fa5f1e4fe37..7cdd94842938 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -1001,7 +1001,7 @@ static struct tvp514x_decoder tvp514x_dev = {
 static struct tvp514x_platform_data *
 tvp514x_get_pdata(struct i2c_client *client)
 {
-        struct tvp514x_platform_data *pdata;
+        struct tvp514x_platform_data *pdata = NULL;
         struct v4l2_of_endpoint bus_cfg;
         struct device_node *endpoint;
         unsigned int flags;
@@ -1013,11 +1013,13 @@ tvp514x_get_pdata(struct i2c_client *client)
         if (!endpoint)
                 return NULL;
 
+        if (v4l2_of_parse_endpoint(endpoint, &bus_cfg))
+                goto done;
+
         pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 goto done;
 
-        v4l2_of_parse_endpoint(endpoint, &bus_cfg);
         flags = bus_cfg.bus.parallel.flags;
 
         if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 6c3769d44b75..ef393f5daf2a 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1,19 +1,22 @@
 /*
- * tvp5150 - Texas Instruments TVP5150A/AM1 video decoder driver
+ * tvp5150 - Texas Instruments TVP5150A/AM1 and TVP5151 video decoder driver
  *
  * Copyright (c) 2005,2006 Mauro Carvalho Chehab (mchehab@infradead.org)
  * This code is placed under the terms of the GNU General Public License v2
  */
 
+#include <dt-bindings/media/tvp5150.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/delay.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <media/v4l2-async.h>
 #include <media/v4l2-device.h>
-#include <media/i2c/tvp5150.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-of.h>
+#include <media/v4l2-mc.h>
 
 #include "tvp5150_reg.h"
 
@@ -24,7 +27,7 @@
 #define TVP5150_MAX_CROP_TOP    127
 #define TVP5150_CROP_SHIFT      2
 
-MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");
+MODULE_DESCRIPTION("Texas Instruments TVP5150A/TVP5150AM1/TVP5151 video decoder driver");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
 
@@ -35,6 +38,11 @@ MODULE_PARM_DESC(debug, "Debug level (0-2)");
 
 struct tvp5150 {
         struct v4l2_subdev sd;
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_pad pads[DEMOD_NUM_PADS];
+        struct media_entity input_ent[TVP5150_INPUT_NUM];
+        struct media_pad input_pad[TVP5150_INPUT_NUM];
+#endif
         struct v4l2_ctrl_handler hdl;
         struct v4l2_rect rect;
 
@@ -42,6 +50,11 @@ struct tvp5150 {
         u32 input;
         u32 output;
         int enable;
+
+        u16 dev_id;
+        u16 rom_ver;
+
+        enum v4l2_mbus_type mbus_type;
 };
 
 static inline struct tvp5150 *to_tvp5150(struct v4l2_subdev *sd)
@@ -246,8 +259,12 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
         int input = 0;
         int val;
 
-        if ((decoder->output & TVP5150_BLACK_SCREEN) || !decoder->enable)
-                input = 8;
+        /* Only tvp5150am1 and tvp5151 have signal generator support */
+        if ((decoder->dev_id == 0x5150 && decoder->rom_ver == 0x0400) ||
+            (decoder->dev_id == 0x5151 && decoder->rom_ver == 0x0100)) {
+                if (!decoder->enable)
+                        input = 8;
+        }
 
         switch (decoder->input) {
         case TVP5150_COMPOSITE1:
@@ -772,12 +789,17 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val)
         v4l2_ctrl_handler_setup(&decoder->hdl);
 
         tvp5150_set_std(sd, decoder->norm);
+
+        if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
+                tvp5150_write(sd, TVP5150_DATA_RATE_SEL, 0x40);
+
         return 0;
 };
 
 static int tvp5150_s_ctrl(struct v4l2_ctrl *ctrl)
 {
         struct v4l2_subdev *sd = to_sd(ctrl);
+        struct tvp5150 *decoder = to_tvp5150(sd);
 
         switch (ctrl->id) {
         case V4L2_CID_BRIGHTNESS:
@@ -791,6 +813,9 @@ static int tvp5150_s_ctrl(struct v4l2_ctrl *ctrl)
                 return 0;
         case V4L2_CID_HUE:
                 tvp5150_write(sd, TVP5150_HUE_CTL, ctrl->val);
+        case V4L2_CID_TEST_PATTERN:
+                decoder->enable = ctrl->val ? false : true;
+                tvp5150_selmux(sd);
                 return 0;
         }
         return -EINVAL;
@@ -818,17 +843,6 @@ static v4l2_std_id tvp5150_read_std(struct v4l2_subdev *sd)
         }
 }
 
-static int tvp5150_enum_mbus_code(struct v4l2_subdev *sd,
-                struct v4l2_subdev_pad_config *cfg,
-                struct v4l2_subdev_mbus_code_enum *code)
-{
-        if (code->pad || code->index)
-                return -EINVAL;
-
-        code->code = MEDIA_BUS_FMT_UYVY8_2X8;
-        return 0;
-}
-
 static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
                 struct v4l2_subdev_pad_config *cfg,
                 struct v4l2_subdev_format *format)
@@ -844,10 +858,10 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
         tvp5150_reset(sd, 0);
 
         f->width = decoder->rect.width;
-        f->height = decoder->rect.height;
+        f->height = decoder->rect.height / 2;
 
         f->code = MEDIA_BUS_FMT_UYVY8_2X8;
-        f->field = V4L2_FIELD_SEQ_TB;
+        f->field = V4L2_FIELD_ALTERNATE;
         f->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
         v4l2_dbg(1, debug, sd, "width = %d, height = %d\n", f->width,
@@ -948,10 +962,110 @@ static int tvp5150_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
+static int tvp5150_g_mbus_config(struct v4l2_subdev *sd,
+                                 struct v4l2_mbus_config *cfg)
+{
+        struct tvp5150 *decoder = to_tvp5150(sd);
+
+        cfg->type = decoder->mbus_type;
+        cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING
+                   | V4L2_MBUS_FIELD_EVEN_LOW | V4L2_MBUS_DATA_ACTIVE_HIGH;
+
+        return 0;
+}
+
+/****************************************************************************
+                        V4L2 subdev pad ops
+ ****************************************************************************/
+static int tvp5150_enum_mbus_code(struct v4l2_subdev *sd,
+                struct v4l2_subdev_pad_config *cfg,
+                struct v4l2_subdev_mbus_code_enum *code)
+{
+        if (code->pad || code->index)
+                return -EINVAL;
+
+        code->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        return 0;
+}
+
+static int tvp5150_enum_frame_size(struct v4l2_subdev *sd,
+                                   struct v4l2_subdev_pad_config *cfg,
+                                   struct v4l2_subdev_frame_size_enum *fse)
+{
+        struct tvp5150 *decoder = to_tvp5150(sd);
+
+        if (fse->index >= 8 || fse->code != MEDIA_BUS_FMT_UYVY8_2X8)
+                return -EINVAL;
+
+        fse->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        fse->min_width = decoder->rect.width;
+        fse->max_width = decoder->rect.width;
+        fse->min_height = decoder->rect.height / 2;
+        fse->max_height = decoder->rect.height / 2;
+
+        return 0;
+}
+
+/****************************************************************************
+                        Media entity ops
+ ****************************************************************************/
+
+static int tvp5150_link_setup(struct media_entity *entity,
+                              const struct media_pad *local,
+                              const struct media_pad *remote, u32 flags)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
+        struct tvp5150 *decoder = to_tvp5150(sd);
+        int i;
+
+        for (i = 0; i < TVP5150_INPUT_NUM; i++) {
+                if (remote->entity == &decoder->input_ent[i])
+                        break;
+        }
+
+        /* Do nothing for entities that are not input connectors */
+        if (i == TVP5150_INPUT_NUM)
+                return 0;
+
+        decoder->input = i;
+
+        tvp5150_selmux(sd);
+#endif
+
+        return 0;
+}
+
+static const struct media_entity_operations tvp5150_sd_media_ops = {
+        .link_setup = tvp5150_link_setup,
+};
+
 /****************************************************************************
                         I2C Command
  ****************************************************************************/
 
+static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
+{
+        struct tvp5150 *decoder = to_tvp5150(sd);
+        /* Output format: 8-bit ITU-R BT.656 with embedded syncs */
+        int val = 0x09;
+
+        /* Output format: 8-bit 4:2:2 YUV with discrete sync */
+        if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
+                val = 0x0d;
+
+        /* Initializes TVP5150 to its default values */
+        /* # set PCLK (27MHz) */
+        tvp5150_write(sd, TVP5150_CONF_SHARED_PIN, 0x00);
+
+        if (enable)
+                tvp5150_write(sd, TVP5150_MISC_CTL, val);
+        else
+                tvp5150_write(sd, TVP5150_MISC_CTL, 0x00);
+
+        return 0;
+}
+
 static int tvp5150_s_routing(struct v4l2_subdev *sd,
                              u32 input, u32 output, u32 config)
 {
@@ -959,6 +1073,12 @@ static int tvp5150_s_routing(struct v4l2_subdev *sd,
 
         decoder->input = input;
         decoder->output = output;
+
+        if (output == TVP5150_BLACK_SCREEN)
+                decoder->enable = false;
+        else
+                decoder->enable = true;
+
         tvp5150_selmux(sd);
         return 0;
 }
@@ -1052,6 +1172,42 @@ static int tvp5150_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
         return 0;
 }
 
+static int tvp5150_registered_async(struct v4l2_subdev *sd)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct tvp5150 *decoder = to_tvp5150(sd);
+        int ret = 0;
+        int i;
+
+        for (i = 0; i < TVP5150_INPUT_NUM; i++) {
+                struct media_entity *input = &decoder->input_ent[i];
+                struct media_pad *pad = &decoder->input_pad[i];
+
+                if (!input->name)
+                        continue;
+
+                decoder->input_pad[i].flags = MEDIA_PAD_FL_SOURCE;
+
+                ret = media_entity_pads_init(input, 1, pad);
+                if (ret < 0)
+                        return ret;
+
+                ret = media_device_register_entity(sd->v4l2_dev->mdev, input);
+                if (ret < 0)
+                        return ret;
+
+                ret = media_create_pad_link(input, 0, &sd->entity,
+                                            DEMOD_PAD_IF_INPUT, 0);
+                if (ret < 0) {
+                        media_device_unregister_entity(input);
+                        return ret;
+                }
+        }
+#endif
+
+        return 0;
+}
+
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_ctrl_ops tvp5150_ctrl_ops = {
@@ -1065,6 +1221,7 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
         .g_register = tvp5150_g_register,
         .s_register = tvp5150_s_register,
 #endif
+        .registered_async = tvp5150_registered_async,
 };
 
 static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {
@@ -1073,10 +1230,12 @@ static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {
 
 static const struct v4l2_subdev_video_ops tvp5150_video_ops = {
         .s_std = tvp5150_s_std,
+        .s_stream = tvp5150_s_stream,
         .s_routing = tvp5150_s_routing,
         .s_crop = tvp5150_s_crop,
         .g_crop = tvp5150_g_crop,
         .cropcap = tvp5150_cropcap,
+        .g_mbus_config = tvp5150_g_mbus_config,
 };
 
 static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {
@@ -1088,6 +1247,7 @@ static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {
 
 static const struct v4l2_subdev_pad_ops tvp5150_pad_ops = {
         .enum_mbus_code = tvp5150_enum_mbus_code,
+        .enum_frame_size = tvp5150_enum_frame_size,
         .set_fmt = tvp5150_fill_fmt,
         .get_fmt = tvp5150_fill_fmt,
 };
@@ -1105,63 +1265,239 @@ static const struct v4l2_subdev_ops tvp5150_ops = {
                         I2C Client & Driver
  ****************************************************************************/
 
+static int tvp5150_detect_version(struct tvp5150 *core)
+{
+        struct v4l2_subdev *sd = &core->sd;
+        struct i2c_client *c = v4l2_get_subdevdata(sd);
+        unsigned int i;
+        u8 regs[4];
+        int res;
+
+        /*
+         * Read consequent registers - TVP5150_MSB_DEV_ID, TVP5150_LSB_DEV_ID,
+         * TVP5150_ROM_MAJOR_VER, TVP5150_ROM_MINOR_VER
+         */
+        for (i = 0; i < 4; i++) {
+                res = tvp5150_read(sd, TVP5150_MSB_DEV_ID + i);
+                if (res < 0)
+                        return res;
+                regs[i] = res;
+        }
+
+        core->dev_id = (regs[0] << 8) | regs[1];
+        core->rom_ver = (regs[2] << 8) | regs[3];
+
+        v4l2_info(sd, "tvp%04x (%u.%u) chip found @ 0x%02x (%s)\n",
+                  core->dev_id, regs[2], regs[3], c->addr << 1,
+                  c->adapter->name);
+
+        if (core->dev_id == 0x5150 && core->rom_ver == 0x0321) {
+                v4l2_info(sd, "tvp5150a detected.\n");
+        } else if (core->dev_id == 0x5150 && core->rom_ver == 0x0400) {
+                v4l2_info(sd, "tvp5150am1 detected.\n");
+
+                /* ITU-T BT.656.4 timing */
+                tvp5150_write(sd, TVP5150_REV_SELECT, 0);
+        } else if (core->dev_id == 0x5151 && core->rom_ver == 0x0100) {
+                v4l2_info(sd, "tvp5151 detected.\n");
+        } else {
+                v4l2_info(sd, "*** unknown tvp%04x chip detected.\n",
+                          core->dev_id);
+        }
+
+        return 0;
+}
+
+static int tvp5150_init(struct i2c_client *c)
+{
+        struct gpio_desc *pdn_gpio;
+        struct gpio_desc *reset_gpio;
+
+        pdn_gpio = devm_gpiod_get_optional(&c->dev, "pdn", GPIOD_OUT_HIGH);
+        if (IS_ERR(pdn_gpio))
+                return PTR_ERR(pdn_gpio);
+
+        if (pdn_gpio) {
+                gpiod_set_value_cansleep(pdn_gpio, 0);
+                /* Delay time between power supplies active and reset */
+                msleep(20);
+        }
+
+        reset_gpio = devm_gpiod_get_optional(&c->dev, "reset", GPIOD_OUT_HIGH);
+        if (IS_ERR(reset_gpio))
+                return PTR_ERR(reset_gpio);
+
+        if (reset_gpio) {
+                /* RESETB pulse duration */
+                ndelay(500);
+                gpiod_set_value_cansleep(reset_gpio, 0);
+                /* Delay time between end of reset to I2C active */
+                usleep_range(200, 250);
+        }
+
+        return 0;
+}
+
+static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
+{
+        struct v4l2_of_endpoint bus_cfg;
+        struct device_node *ep;
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct device_node *connectors, *child;
+        struct media_entity *input;
+        const char *name;
+        u32 input_type;
+#endif
+        unsigned int flags;
+        int ret = 0;
+
+        ep = of_graph_get_next_endpoint(np, NULL);
+        if (!ep)
+                return -EINVAL;
+
+        ret = v4l2_of_parse_endpoint(ep, &bus_cfg);
+        if (ret)
+                goto err;
+
+        flags = bus_cfg.bus.parallel.flags;
+
+        if (bus_cfg.bus_type == V4L2_MBUS_PARALLEL &&
+            !(flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH &&
+              flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH &&
+              flags & V4L2_MBUS_FIELD_EVEN_LOW)) {
+                ret = -EINVAL;
+                goto err;
+        }
+
+        decoder->mbus_type = bus_cfg.bus_type;
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        connectors = of_get_child_by_name(np, "connectors");
+
+        if (!connectors)
+                goto err;
+
+        for_each_available_child_of_node(connectors, child) {
+                ret = of_property_read_u32(child, "input", &input_type);
+                if (ret) {
+                        v4l2_err(&decoder->sd,
+                                 "missing type property in node %s\n",
+                                 child->name);
+                        goto err_connector;
+                }
+
+                if (input_type > TVP5150_INPUT_NUM) {
+                        ret = -EINVAL;
+                        goto err_connector;
+                }
+
+                input = &decoder->input_ent[input_type];
+
+                /* Each input connector can only be defined once */
+                if (input->name) {
+                        v4l2_err(&decoder->sd,
+                                 "input %s with same type already exists\n",
+                                 input->name);
+                        ret = -EINVAL;
+                        goto err_connector;
+                }
+
+                switch (input_type) {
+                case TVP5150_COMPOSITE0:
+                case TVP5150_COMPOSITE1:
+                        input->function = MEDIA_ENT_F_CONN_COMPOSITE;
+                        break;
+                case TVP5150_SVIDEO:
+                        input->function = MEDIA_ENT_F_CONN_SVIDEO;
+                        break;
+                }
+
+                input->flags = MEDIA_ENT_FL_CONNECTOR;
+
+                ret = of_property_read_string(child, "label", &name);
+                if (ret < 0) {
+                        v4l2_err(&decoder->sd,
+                                 "missing label property in node %s\n",
+                                 child->name);
+                        goto err_connector;
+                }
+
+                input->name = name;
+        }
+
+err_connector:
+        of_node_put(connectors);
+#endif
+err:
+        of_node_put(ep);
+        return ret;
+}
+
+static const char * const tvp5150_test_patterns[2] = {
+        "Disabled",
+        "Black screen"
+};
+
 static int tvp5150_probe(struct i2c_client *c,
                          const struct i2c_device_id *id)
 {
         struct tvp5150 *core;
         struct v4l2_subdev *sd;
-        int tvp5150_id[4];
-        int i, res;
+        struct device_node *np = c->dev.of_node;
+        int res;
 
         /* Check if the adapter supports the needed features */
         if (!i2c_check_functionality(c->adapter,
              I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
                 return -EIO;
 
+        res = tvp5150_init(c);
+        if (res)
+                return res;
+
         core = devm_kzalloc(&c->dev, sizeof(*core), GFP_KERNEL);
         if (!core)
                 return -ENOMEM;
+
         sd = &core->sd;
-        v4l2_i2c_subdev_init(sd, c, &tvp5150_ops);
 
-        /* 
-         * Read consequent registers - TVP5150_MSB_DEV_ID, TVP5150_LSB_DEV_ID,
-         * TVP5150_ROM_MAJOR_VER, TVP5150_ROM_MINOR_VER 
-         */
-        for (i = 0; i < 4; i++) {
-                res = tvp5150_read(sd, TVP5150_MSB_DEV_ID + i);
-                if (res < 0)
+        if (IS_ENABLED(CONFIG_OF) && np) {
+                res = tvp5150_parse_dt(core, np);
+                if (res) {
+                        v4l2_err(sd, "DT parsing error: %d\n", res);
                         return res;
-                tvp5150_id[i] = res;
+                }
+        } else {
+                /* Default to BT.656 embedded sync */
+                core->mbus_type = V4L2_MBUS_BT656;
         }
 
-        v4l_info(c, "chip found @ 0x%02x (%s)\n",
-                 c->addr << 1, c->adapter->name);
+        v4l2_i2c_subdev_init(sd, c, &tvp5150_ops);
+        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
 
-        if (tvp5150_id[2] == 4 && tvp5150_id[3] == 0) { /* Is TVP5150AM1 */
-                v4l2_info(sd, "tvp%02x%02xam1 detected.\n",
-                          tvp5150_id[0], tvp5150_id[1]);
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        core->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+        core->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
+        core->pads[DEMOD_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
 
-                /* ITU-T BT.656.4 timing */
-                tvp5150_write(sd, TVP5150_REV_SELECT, 0);
-        } else {
-                /* Is TVP5150A */
-                if (tvp5150_id[2] == 3 || tvp5150_id[3] == 0x21) {
-                        v4l2_info(sd, "tvp%02x%02xa detected.\n",
-                                  tvp5150_id[0], tvp5150_id[1]);
-                } else {
-                        v4l2_info(sd, "*** unknown tvp%02x%02x chip detected.\n",
-                                  tvp5150_id[0], tvp5150_id[1]);
-                        v4l2_info(sd, "*** Rom ver is %d.%d\n",
-                                  tvp5150_id[2], tvp5150_id[3]);
-                }
-        }
+        sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
+
+        res = media_entity_pads_init(&sd->entity, DEMOD_NUM_PADS, core->pads);
+        if (res < 0)
+                return res;
+
+        sd->entity.ops = &tvp5150_sd_media_ops;
+#endif
+
+        res = tvp5150_detect_version(core);
+        if (res < 0)
+                return res;
 
         core->norm = V4L2_STD_ALL;      /* Default is autodetect */
         core->input = TVP5150_COMPOSITE1;
-        core->enable = 1;
+        core->enable = true;
 
-        v4l2_ctrl_handler_init(&core->hdl, 4);
+        v4l2_ctrl_handler_init(&core->hdl, 5);
         v4l2_ctrl_new_std(&core->hdl, &tvp5150_ctrl_ops,
                         V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
         v4l2_ctrl_new_std(&core->hdl, &tvp5150_ctrl_ops,
@@ -1170,6 +1506,13 @@ static int tvp5150_probe(struct i2c_client *c,
                         V4L2_CID_SATURATION, 0, 255, 1, 128);
         v4l2_ctrl_new_std(&core->hdl, &tvp5150_ctrl_ops,
                         V4L2_CID_HUE, -128, 127, 1, 0);
+        v4l2_ctrl_new_std(&core->hdl, &tvp5150_ctrl_ops,
+                        V4L2_CID_PIXEL_RATE, 27000000,
+                        27000000, 1, 27000000);
+        v4l2_ctrl_new_std_menu_items(&core->hdl, &tvp5150_ctrl_ops,
+                                     V4L2_CID_TEST_PATTERN,
+                                     ARRAY_SIZE(tvp5150_test_patterns),
+                                     0, 0, tvp5150_test_patterns);
         sd->ctrl_handler = &core->hdl;
         if (core->hdl.error) {
                 res = core->hdl.error;
@@ -1221,8 +1564,17 @@ static const struct i2c_device_id tvp5150_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tvp5150_id);
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id tvp5150_of_match[] = {
+        { .compatible = "ti,tvp5150", },
+        { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, tvp5150_of_match);
+#endif
+
 static struct i2c_driver tvp5150_driver = {
         .driver = {
+                .of_match_table = of_match_ptr(tvp5150_of_match),
                 .name   = "tvp5150",
         },
         .probe          = tvp5150_probe,
diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index 83c79fa5f61d..4df640c3aa40 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -894,7 +894,7 @@ static struct tvp7002_config *
 tvp7002_get_pdata(struct i2c_client *client)
 {
         struct v4l2_of_endpoint bus_cfg;
-        struct tvp7002_config *pdata;
+        struct tvp7002_config *pdata = NULL;
         struct device_node *endpoint;
         unsigned int flags;
 
@@ -905,11 +905,13 @@ tvp7002_get_pdata(struct i2c_client *client)
         if (!endpoint)
                 return NULL;
 
+        if (v4l2_of_parse_endpoint(endpoint, &bus_cfg))
+                goto done;
+
         pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 goto done;
 
-        v4l2_of_parse_endpoint(endpoint, &bus_cfg);
         flags = bus_cfg.bus.parallel.flags;
 
         if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index 4b564f17f618..90b693f4e2ab 100644
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -124,7 +124,7 @@ static int vpx3220_fp_write(struct v4l2_subdev *sd, u8 fpaddr, u16 data)
         return 0;
 }
 
-static u16 vpx3220_fp_read(struct v4l2_subdev *sd, u16 fpaddr)
+static int vpx3220_fp_read(struct v4l2_subdev *sd, u16 fpaddr)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         s16 data;
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 7dae0ac0f3ae..5ebb3cd31345 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -55,7 +55,11 @@ static int media_device_get_info(struct media_device *dev,
 
         memset(&info, 0, sizeof(info));
 
-        strlcpy(info.driver, dev->dev->driver->name, sizeof(info.driver));
+        if (dev->driver_name[0])
+                strlcpy(info.driver, dev->driver_name, sizeof(info.driver));
+        else
+                strlcpy(info.driver, dev->dev->driver->name, sizeof(info.driver));
+
         strlcpy(info.model, dev->model, sizeof(info.model));
         strlcpy(info.serial, dev->serial, sizeof(info.serial));
         strlcpy(info.bus_info, dev->bus_info, sizeof(info.bus_info));
@@ -234,7 +238,6 @@ static long media_device_setup_link(struct media_device *mdev,
         return ret;
 }
 
-#if 0 /* Let's postpone it to Kernel 4.6 */
 static long __media_device_get_topology(struct media_device *mdev,
                                       struct media_v2_topology *topo)
 {
@@ -390,7 +393,6 @@ static long media_device_get_topology(struct media_device *mdev,
 
         return 0;
 }
-#endif
 
 static long media_device_ioctl(struct file *filp, unsigned int cmd,
                                unsigned long arg)
@@ -424,14 +426,13 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd,
                 mutex_unlock(&dev->graph_mutex);
                 break;
 
-#if 0 /* Let's postpone it to Kernel 4.6 */
         case MEDIA_IOC_G_TOPOLOGY:
                 mutex_lock(&dev->graph_mutex);
                 ret = media_device_get_topology(dev,
                                 (struct media_v2_topology __user *)arg);
                 mutex_unlock(&dev->graph_mutex);
                 break;
-#endif
+
         default:
                 ret = -ENOIOCTLCMD;
         }
@@ -480,9 +481,7 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd,
         case MEDIA_IOC_DEVICE_INFO:
         case MEDIA_IOC_ENUM_ENTITIES:
         case MEDIA_IOC_SETUP_LINK:
-#if 0 /* Let's postpone it to Kernel 4.6 */
         case MEDIA_IOC_G_TOPOLOGY:
-#endif
                 return media_device_ioctl(filp, cmd, arg);
 
         case MEDIA_IOC_ENUM_LINKS32:
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index cea35bf20011..29409f440f1c 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -181,6 +181,7 @@ static int media_open(struct inode *inode, struct file *filp)
                 ret = mdev->fops->open(filp);
                 if (ret) {
                         put_device(&mdev->dev);
+                        filp->private_data = NULL;
                         return ret;
                 }
         }
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index e89d85a7d31b..f2e43603d6d2 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -452,9 +452,12 @@ error:
         media_entity_graph_walk_start(graph, entity_err);
 
         while ((entity_err = media_entity_graph_walk_next(graph))) {
-                entity_err->stream_count--;
-                if (entity_err->stream_count == 0)
-                        entity_err->pipe = NULL;
+                /* don't let the stream_count go negative */
+                if (entity->stream_count > 0) {
+                        entity_err->stream_count--;
+                        if (entity_err->stream_count == 0)
+                                entity_err->pipe = NULL;
+                }
 
                 /*
                  * We haven't increased stream_count further than this
@@ -486,9 +489,12 @@ void media_entity_pipeline_stop(struct media_entity *entity)
         media_entity_graph_walk_start(graph, entity);
 
         while ((entity = media_entity_graph_walk_next(graph))) {
-                entity->stream_count--;
-                if (entity->stream_count == 0)
-                        entity->pipe = NULL;
+                /* don't let the stream_count go negative */
+                if (entity->stream_count > 0) {
+                        entity->stream_count--;
+                        if (entity->stream_count == 0)
+                                entity->pipe = NULL;
+                }
         }
 
         if (!--pipe->streaming_count)
diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c
index 8b5e0b3a92a0..4cac1fc233f2 100644
--- a/drivers/media/pci/b2c2/flexcop-pci.c
+++ b/drivers/media/pci/b2c2/flexcop-pci.c
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(debug,
 
 #define DRIVER_VERSION "0.1"
 #define DRIVER_NAME "flexcop-pci"
-#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@posteo.de>"
 
 struct flexcop_pci {
         struct pci_dev *pdev;
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 9400e996087b..2c412377507b 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -186,7 +186,7 @@ MODULE_VERSION(BTTV_VERSION);
 static ssize_t show_card(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
-        struct video_device *vfd = container_of(cd, struct video_device, dev);
+        struct video_device *vfd = to_video_device(cd);
         struct bttv *btv = video_get_drvdata(vfd);
         return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET);
 }
@@ -1726,22 +1726,15 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id)
         struct bttv_fh *fh  = priv;
         struct bttv *btv = fh->btv;
         unsigned int i;
-        int err = 0;
 
         for (i = 0; i < BTTV_TVNORMS; i++)
                 if (id & bttv_tvnorms[i].v4l2_id)
                         break;
-        if (i == BTTV_TVNORMS) {
-                err = -EINVAL;
-                goto err;
-        }
-
+        if (i == BTTV_TVNORMS)
+                return -EINVAL;
         btv->std = id;
         set_tvnorm(btv, i);
-
-err:
-
-        return err;
+        return 0;
 }
 
 static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id)
@@ -1770,12 +1763,9 @@ static int bttv_enum_input(struct file *file, void *priv,
 {
         struct bttv_fh *fh = priv;
         struct bttv *btv = fh->btv;
-        int rc = 0;
 
-        if (i->index >= bttv_tvcards[btv->c.type].video_inputs) {
-                rc = -EINVAL;
-                goto err;
-        }
+        if (i->index >= bttv_tvcards[btv->c.type].video_inputs)
+                return -EINVAL;
 
         i->type     = V4L2_INPUT_TYPE_CAMERA;
         i->audioset = 0;
@@ -1799,10 +1789,7 @@ static int bttv_enum_input(struct file *file, void *priv,
         }
 
         i->std = BTTV_NORMS;
-
-err:
-
-        return rc;
+        return 0;
 }
 
 static int bttv_g_input(struct file *file, void *priv, unsigned int *i)
diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
index 4a90eee5e3bb..35bc9b2287b4 100644
--- a/drivers/media/pci/bt8xx/dst.c
+++ b/drivers/media/pci/bt8xx/dst.c
@@ -1688,9 +1688,9 @@ static int dst_get_tuning_algo(struct dvb_frontend *fe)
         return dst_algo ? DVBFE_ALGO_HW : DVBFE_ALGO_SW;
 }
 
-static int dst_get_frontend(struct dvb_frontend *fe)
+static int dst_get_frontend(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct dst_state *state = fe->demodulator_priv;
 
         p->frequency = state->decode_freq;
diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
index d407244fd1bc..e69d338ab9be 100644
--- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
@@ -318,7 +318,7 @@ static int microtune_mt7202dtf_request_firmware(struct dvb_frontend* fe, const s
         return request_firmware(fw, name, &bt->bt->dev->dev);
 }
 
-static struct sp887x_config microtune_mt7202dtf_config = {
+static const struct sp887x_config microtune_mt7202dtf_config = {
         .demod_address = 0x70,
         .request_firmware = microtune_mt7202dtf_request_firmware,
 };
@@ -458,7 +458,7 @@ static void or51211_sleep(struct dvb_frontend * fe)
         bttv_write_gpio(bt->bttv_nr, 0x0001, 0x0000);
 }
 
-static struct or51211_config or51211_config = {
+static const struct or51211_config or51211_config = {
         .demod_address = 0x15,
         .request_firmware = or51211_request_firmware,
         .setmode = or51211_setmode,
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 80319bb73d94..5131c9f555fb 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -2301,7 +2301,8 @@ static int dvb_register(struct cx23885_tsport *port)
 
         /* register everything */
         ret = vb2_dvb_register_bus(&port->frontends, THIS_MODULE, port,
-                                        &dev->pci->dev, adapter_nr, mfe_shared);
+                                   &dev->pci->dev, NULL,
+                                   adapter_nr, mfe_shared);
         if (ret)
                 goto frontend_detach;
 
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index afb20756d7a5..851d2a9caed3 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -1642,7 +1642,8 @@ static int dvb_register(struct cx8802_dev *dev)
 
         /* register everything */
         res = vb2_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
-                &dev->pci->dev, adapter_nr, mfe_shared);
+                                   &dev->pci->dev, NULL, adapter_nr,
+                                   mfe_shared);
         if (res)
                 goto frontend_detach;
         return res;
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 9d5b314142f1..6e995ef8c37e 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -690,7 +690,7 @@ static int tuner_attach_stv6110(struct ddb_input *input, int type)
         struct stv090x_config *feconf = type ? &stv0900_aa : &stv0900;
         struct stv6110x_config *tunerconf = (input->nr & 1) ?
                 &stv6110b : &stv6110a;
-        struct stv6110x_devctl *ctl;
+        const struct stv6110x_devctl *ctl;
 
         ctl = dvb_attach(stv6110x_attach, input->fe, tunerconf, i2c);
         if (!ctl) {
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 525ebfefeee8..2b667b315913 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -462,8 +462,8 @@ static int netup_unidvb_dvb_init(struct netup_unidvb_dev *ndev,
         }
 
         if (vb2_dvb_register_bus(&ndev->frontends[num],
-                        THIS_MODULE, NULL,
-                        &ndev->pci_dev->dev, adapter_nr, 1)) {
+                                 THIS_MODULE, NULL,
+                                 &ndev->pci_dev->dev, NULL, adapter_nr, 1)) {
                 dev_dbg(&ndev->pci_dev->dev,
                         "%s(): unable to register DVB bus %d\n",
                         __func__, num);
@@ -771,10 +771,9 @@ static int netup_unidvb_initdev(struct pci_dev *pci_dev,
 
         /* allocate device context */
         ndev = kzalloc(sizeof(*ndev), GFP_KERNEL);
-
         if (!ndev)
                 goto dev_alloc_err;
-        memset(ndev, 0, sizeof(*ndev));
+
         ndev->old_fw = old_firmware;
         ndev->wq = create_singlethread_workqueue(NETUP_UNIDVB_NAME);
         if (!ndev->wq) {
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index 039bed3cc919..4e783a68bf4a 100644
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -57,7 +57,7 @@ static int tuner_attach_stv6110(struct ngene_channel *chan)
                 chan->dev->card_info->fe_config[chan->number];
         struct stv6110x_config *tunerconf = (struct stv6110x_config *)
                 chan->dev->card_info->tuner_config[chan->number];
-        struct stv6110x_devctl *ctl;
+        const struct stv6110x_devctl *ctl;
 
         /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
         if (chan->number < 2)
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index 29d2094c42a0..9a2fdc78eb85 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -36,17 +36,23 @@
 #include "xc5000.h"
 #include "s5h1411.h"
 
-/* commly used strings */
-static char name_mute[]    = "mute";
-static char name_radio[]   = "Radio";
-static char name_tv[]      = "Television";
-static char name_tv_mono[] = "TV (mono only)";
-static char name_comp[]    = "Composite";
-static char name_comp1[]   = "Composite1";
-static char name_comp2[]   = "Composite2";
-static char name_comp3[]   = "Composite3";
-static char name_comp4[]   = "Composite4";
-static char name_svideo[]  = "S-Video";
+/* Input names */
+const char * const saa7134_input_name[] = {
+        [SAA7134_INPUT_MUTE]       = "mute",
+        [SAA7134_INPUT_RADIO]      = "Radio",
+        [SAA7134_INPUT_TV]         = "Television",
+        [SAA7134_INPUT_TV_MONO]    = "TV (mono only)",
+        [SAA7134_INPUT_COMPOSITE]  = "Composite",
+        [SAA7134_INPUT_COMPOSITE0] = "Composite0",
+        [SAA7134_INPUT_COMPOSITE1] = "Composite1",
+        [SAA7134_INPUT_COMPOSITE2] = "Composite2",
+        [SAA7134_INPUT_COMPOSITE3] = "Composite3",
+        [SAA7134_INPUT_COMPOSITE4] = "Composite4",
+        [SAA7134_INPUT_SVIDEO]     = "S-Video",
+        [SAA7134_INPUT_SVIDEO0]    = "S-Video0",
+        [SAA7134_INPUT_SVIDEO1]    = "S-Video1",
+        [SAA7134_INPUT_COMPOSITE_OVER_SVIDEO] = "Composite over S-Video",
+};
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -69,7 +75,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                        .name = "default",
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 0,
                         .amux = LINE1,
                 }},
@@ -84,22 +90,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -114,40 +118,38 @@ struct saa7134_board saa7134_boards[] = {
 
                 .gpiomask       = 0xe000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x8000,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x2000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x8000,
                 },
@@ -163,34 +165,33 @@ struct saa7134_board saa7134_boards[] = {
 
                 .gpiomask       = 0xe000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x2000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x8000,
                 },
@@ -205,20 +206,19 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -235,40 +235,38 @@ struct saa7134_board saa7134_boards[] = {
 
                 .gpiomask       = 0x1E000,      /* Set GP16 and unused 15,14,13 to Output */
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x10000,        /* GP16=1 selects TV input */
-                        .tv   = 1,
                 },{
-/*                      .name = name_tv_mono,
+/*                      .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-*/                      .name = name_comp1,     /* Composite signal on S-Video input */
+*/                      .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
 /*                      .gpio = 0x4000,         */
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE2,
 /*                      .gpio = 0x4000,         */
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
 /*                      .gpio = 0x4000,         */
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x00000,        /* GP16=0 selects FM radio antenna */
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x10000,
                 },
@@ -285,40 +283,38 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0xe000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x8000,
-                        .tv   = 1,
                 }, {
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }, {
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x2000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x8000,
                 },
@@ -334,21 +330,20 @@ struct saa7134_board saa7134_boards[] = {
                 .empress_addr   = 0x20,
 
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mpeg      = SAA7134_MPEG_EMPRESS,
@@ -364,21 +359,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -390,35 +384,33 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
                         /* workaround for problems with normal TV sound */
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                .mute = {
-                       .name = name_mute,
+                       .type = SAA7134_INPUT_MUTE,
                        .amux = TV,
                },
         },
@@ -432,32 +424,30 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux   = LINE2,
-                        .tv   = 1,
                 },{
 
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
 
-                        .name = "CVid over SVid",
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -472,24 +462,23 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x820000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x20000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x20000,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x20000,
                 }},
                 .radio          = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x20000,
                 },
@@ -504,20 +493,19 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 4,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2, /* CVideo over SVideo Connector */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                 }}
@@ -531,31 +519,29 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
                         /* workaround for problems with normal TV sound */
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -567,18 +553,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_CINERGY600] = {
@@ -590,25 +575,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2, /* CVideo over SVideo Connector */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -622,25 +606,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                },
                .mute = {
-                       .name = name_mute,
+                       .type = SAA7134_INPUT_MUTE,
                        .amux = TV,
                 },
         },
@@ -655,21 +638,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                 },
         },
@@ -681,18 +663,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 4,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_ELSA_500TV] = {
@@ -703,19 +684,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 7,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 8,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 8,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_ELSA_700TV] = {
@@ -726,21 +705,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 4,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 6,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 7,
                         .amux = LINE1,
                 }},
                 .mute           = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                 },
         },
@@ -753,21 +731,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                 },
         },
@@ -780,29 +757,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE2,
                         .gpio = 0x0000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE2,
                         .gpio = 0x0000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x200000,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .gpio = 0x0000,
                 },
 
@@ -815,18 +791,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_10MOONSTVMASTER] = {
@@ -839,34 +814,33 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0xe000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x2000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x8000,
                 },
@@ -881,23 +855,23 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .empress_addr   = 0x20,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_comp3,
+                        .type = SAA7134_INPUT_COMPOSITE3,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_comp4,
+                        .type = SAA7134_INPUT_COMPOSITE4,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -912,18 +886,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS] = {
@@ -935,21 +908,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x06c00012,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x0ac20012,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x08c20012,
-                        .tv   = 1,
                 }},                             /* radio and probably mute is missing */
         },
         [SAA7134_BOARD_CRONOS_PLUS] = {
@@ -968,23 +940,23 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0xcf00,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .gpio = 2 << 14,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .gpio = 1 << 14,
                 },{
-                        .name = name_comp3,
+                        .type = SAA7134_INPUT_COMPOSITE3,
                         .vmux = 0,
                         .gpio = 0 << 14,
                 },{
-                        .name = name_comp4,
+                        .type = SAA7134_INPUT_COMPOSITE4,
                         .vmux = 0,
                         .gpio = 3 << 14,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .gpio = 2 << 14,
                 }},
@@ -999,34 +971,33 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x03,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x00,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x02,
                 }, {
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE1,
                         .gpio = 0x02,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x02,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                         .gpio = 0x01,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x00,
                 },
@@ -1041,18 +1012,17 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .empress_addr   = 0x20,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }},
                 .mpeg      = SAA7134_MPEG_EMPRESS,
                 .video_out = CCIR656,
@@ -1068,22 +1038,21 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
 
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                 },
         },
@@ -1096,20 +1065,19 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 1,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -1123,21 +1091,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -1150,21 +1117,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -1177,16 +1143,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -1199,30 +1164,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux   = 1,
                         .amux   = LINE2,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 },{
-                        .name   = "CVid over SVid",
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux   = 0,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                 },
         },
@@ -1234,30 +1197,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux   = 1,
                         .amux   = LINE2,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 },{
-                        .name   = "CVid over SVid",
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux   = 0,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                 },
         },
@@ -1270,30 +1231,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux   = 1,
                         .amux   = LINE2,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 },{
-                        .name   = "CVid over SVid",
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux   = 0,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                 },
         },
@@ -1306,30 +1265,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x200000,
                 },
@@ -1343,10 +1300,10 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                 }},
         },
@@ -1360,10 +1317,9 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                  .mpeg           = SAA7134_MPEG_DVB,
                  .inputs         = {{
-                         .name = name_tv,
+                         .type = SAA7134_INPUT_TV,
                          .vmux = 1,
                          .amux = TV,
-                         .tv   = 1,
                  } },
         },
         [SAA7134_BOARD_NOVAC_PRIMETV7133] = {
@@ -1375,15 +1331,14 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                 }},
         },
@@ -1396,29 +1351,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -1432,29 +1386,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -1467,12 +1420,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 7,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 7,
                         .amux = LINE1,
                 }},
@@ -1486,21 +1438,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -1512,25 +1463,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2, /* CVideo over SVideo Connector */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                 },
         },
@@ -1544,29 +1494,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x808c0080,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x00080,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x00080,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2_LEFT,
-                        .tv   = 1,
                         .gpio = 0x00080,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x80000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x40000,
                 },
@@ -1580,21 +1529,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                 },
         },
@@ -1607,18 +1555,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_EMPIRE_PCI_TV_RADIO_LE] = {
@@ -1631,29 +1578,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x4000,
                 .inputs         = {{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x8000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x8000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                         .gpio = 0x8000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                         .gpio = 0x8000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio =0x8000,
                 }
@@ -1672,29 +1618,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x03,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x00,
                 },{
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x02,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x02,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                         .gpio = 0x01,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                         .gpio = 0x00,
                 },
@@ -1709,29 +1654,28 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 0x00300003,
                 /* .gpiomask       = 0x8c240003, */
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x01,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                         .gpio = 0x02,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                         .gpio = 0x02,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x00300001,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x01,
                 },
@@ -1745,21 +1689,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                 },
         },
@@ -1774,24 +1717,23 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x08000000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x08000000,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x08000000,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x08000000,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x00000000,
                 },
@@ -1805,21 +1747,19 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -1834,25 +1774,24 @@ struct saa7134_board saa7134_boards[] = {
                 .rds_addr       = 0x10,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 4,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2, /* CVideo over SVideo Connector */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -1866,29 +1805,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x1ce780,
                 .inputs         = {{
-                        .name = name_svideo,
-                        .vmux = 0,              /* CVideo over SVideo Connector - ok? */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
+                        .vmux = 0,
                         .amux = LINE1,
                         .gpio = 0x008080,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x008080,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x008080,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x80000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x0c8000,
                 },
@@ -1903,20 +1841,19 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 1,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -1931,22 +1868,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -1961,25 +1896,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -1995,26 +1929,25 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 0x00200000,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x200000,       /* GPIO21=High for TV input */
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x000000,       /* GPIO21=Low for FM radio antenna */
                 },
@@ -2028,11 +1961,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
@@ -2049,20 +1982,19 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -2075,16 +2007,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -2098,29 +2029,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x0700,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                         .gpio   = 0x000,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                         .gpio   = 0x200,                /* gpio by DScaler */
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 0,
                         .amux   = LINE1,
                         .gpio   = 0x200,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE1,
                         .gpio   = 0x100,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x000,
                 },
@@ -2135,26 +2065,25 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x00200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x200000,       /* GPIO21=High for TV input */
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x000000,       /* GPIO21=Low for FM radio antenna */
                 },
@@ -2168,29 +2097,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = 0x60,
                 .gpiomask       = 0x8c1880,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 0,
                         .amux = LINE1,
                         .gpio = 0x800800,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x801000,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x800000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x880000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x840000,
                 },
@@ -2213,29 +2141,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = 0x60,
                 .gpiomask       = 0x0700,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                         .gpio   = 0x000,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                         .gpio   = 0x200,                /* gpio by DScaler */
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 0,
                         .amux   = LINE1,
                         .gpio   = 0x200,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE1,
                         .gpio   = 0x100,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x000,
                 },
@@ -2248,30 +2175,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,             /* radio unconfirmed */
+                        .type = SAA7134_INPUT_RADIO,            /* radio unconfirmed */
                         .amux = LINE2,
                 },
         },
@@ -2286,24 +2211,23 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 1 << 21,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x0000000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x0000000,
                 },{
-                        .name = name_svideo,    /* S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x0000000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -2322,29 +2246,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr= ADDR_UNSET,
                 .gpiomask       = 0x00010003,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x01,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x02,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE2,
                         .gpio = 0x02,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                         .gpio = 0x00010003,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x01,
                 },
@@ -2362,21 +2285,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                          .name = name_tv,
+                          .type = SAA7134_INPUT_TV,
                           .vmux = 3,
                           .amux = TV,
-                          .tv   = 1,
                 },{
-                          .name = name_comp1,
+                          .type = SAA7134_INPUT_COMPOSITE1,
                           .vmux = 1,
                           .amux = LINE1,
                 },{
-                          .name = name_svideo,
+                          .type = SAA7134_INPUT_SVIDEO,
                           .vmux = 8,
                           .amux = LINE1,
                 }},
                 .radio = {
-                          .name = name_radio,
+                          .type = SAA7134_INPUT_RADIO,
                           .amux = LINE2,
                 },
         },
@@ -2392,34 +2314,33 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf    = TDA9887_PRESENT,
                 .gpiomask        = 0x00200003,
                 .inputs          = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x00200003,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x00200003,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x00200003,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x00200003,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x00200003,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x00200003,
                 },
@@ -2434,16 +2355,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE2,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 }},
@@ -2458,16 +2378,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE2,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 }},
@@ -2481,11 +2400,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
@@ -2499,27 +2418,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .empress_addr   = 0x21,
                 .inputs         = {{
-                        .name   = "Composite 0",
+                        .type = SAA7134_INPUT_COMPOSITE0,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = "Composite 1",
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE2,
                 },{
-                        .name   = "Composite 2",
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux   = 2,
                         .amux   = LINE1,
                 },{
-                        .name   = "Composite 3",
+                        .type = SAA7134_INPUT_COMPOSITE3,
                         .vmux   = 3,
                         .amux   = LINE2,
                 },{
-                        .name   = "S-Video 0",
+                        .type = SAA7134_INPUT_SVIDEO0,
+
                         .vmux   = 8,
                         .amux   = LINE1,
                 },{
-                        .name   = "S-Video 1",
+                        .type = SAA7134_INPUT_SVIDEO1,
                         .vmux   = 9,
                         .amux   = LINE2,
                 }},
@@ -2538,27 +2458,27 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name   = "Composite 0",
+                        .type = SAA7134_INPUT_COMPOSITE0,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = "Composite 1",
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE2,
                 },{
-                        .name   = "Composite 2",
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux   = 2,
                         .amux   = LINE1,
                 },{
-                        .name   = "Composite 3",
+                        .type = SAA7134_INPUT_COMPOSITE3,
                         .vmux   = 3,
                         .amux   = LINE2,
                 },{
-                        .name   = "S-Video 0",
+                        .type = SAA7134_INPUT_SVIDEO0,
                         .vmux   = 8,
                         .amux   = LINE1,
                 },{
-                        .name   = "S-Video 1",
+                        .type = SAA7134_INPUT_SVIDEO1,
                         .vmux   = 9,
                         .amux   = LINE2,
                 }},
@@ -2572,20 +2492,19 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -2604,11 +2523,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -2622,16 +2541,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .inputs         = {{
-                          .name = name_tv,
+                          .type = SAA7134_INPUT_TV,
                           .vmux = 1,
                           .amux = TV,
-                          .tv   = 1,
                 },{
-                          .name = name_comp1,
+                          .type = SAA7134_INPUT_COMPOSITE1,
                           .vmux = 3,
                           .amux = LINE1,
                 },{
-                          .name = name_svideo,
+                          .type = SAA7134_INPUT_SVIDEO,
                           .vmux = 6,
                           .amux = LINE1,
                 }},
@@ -2645,25 +2563,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x080200000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 4,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE2,
                 }, {
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -2678,29 +2595,28 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 21,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x0000000,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -2717,21 +2633,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0xe880c0,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -2745,16 +2660,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -2770,21 +2684,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -2798,25 +2711,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 1 << 21,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux   = 3,
                         .amux   = LINE2,        /* unconfirmed, taken from Philips driver */
                 },{
-                        .name   = name_comp2,
-                        .vmux   = 0,            /* untested, Composite over S-Video */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
+                        .vmux   = 0,            /* untested */
                         .amux   = LINE2,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -2834,17 +2746,16 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x80200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,  /* NOT tested */
+                        .type = SAA7134_INPUT_SVIDEO,  /* NOT tested */
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -2861,26 +2772,25 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 0x00200000,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,        /* Analog broadcast/cable TV */
+                        .type = SAA7134_INPUT_TV,       /* Analog broadcast/cable TV */
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x200000,       /* GPIO21=High for TV input */
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x000000,       /* GPIO21=Low for FM radio antenna */
                 },
@@ -2894,11 +2804,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
@@ -2914,11 +2824,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_comp1,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -2933,10 +2843,9 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                         .gpio   = 0x00200000,
                 }},
         },
@@ -2950,25 +2859,24 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 1 << 21,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -2983,21 +2891,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 1 << 21,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -3012,16 +2919,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
@@ -3052,17 +2958,16 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0xca60000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 4,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x04a61000,
                 },{
-                        .name = name_comp2,  /*  Composite SVIDEO (B/W if signal is carried with SVIDEO) */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 1,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 9,           /* 9 is correct as S-VIDEO1 according to a169.inf! */
                         .amux = LINE1,
                 }},
@@ -3086,26 +2991,25 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x200000,       /* GPIO21=High for TV input */
-                        .tv   = 1,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 },{
-                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 3,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x000000,       /* GPIO21=Low for FM radio antenna */
                 },
@@ -3121,40 +3025,38 @@ struct saa7134_board saa7134_boards[] = {
 
                 .gpiomask       = 0xe000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
                         .gpio = 0x8000,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x4000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x2000,
                 },
                         .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x8000,
                 },
@@ -3168,16 +3070,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
@@ -3193,11 +3094,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_comp1,     /* Composite input */
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -3211,25 +3112,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -3244,21 +3144,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                 },
         },
@@ -3272,21 +3171,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT| TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 4,
                         .amux   = LINE2,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE1,
                 },
         },
@@ -3301,25 +3199,24 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x000200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 4,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE2,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -3335,34 +3232,33 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x03,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x00,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x00,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x00,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x00,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x01,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                         .gpio = 0x00,
                 },
@@ -3378,16 +3274,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE2,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 }},
@@ -3405,22 +3300,21 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200100,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x0000100,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200100,
                 },
@@ -3438,22 +3332,21 @@ struct saa7134_board saa7134_boards[] = {
                 .ts_force_val   = 1,
                 .gpiomask       = 0x0800100, /* GPIO 21 is an INPUT */
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x0000100,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0800100, /* GPIO 23 HI for FM */
                 },
@@ -3470,22 +3363,21 @@ struct saa7134_board saa7134_boards[] = {
                 .ts_type        = SAA7134_MPEG_TS_SERIAL,
                 .gpiomask       = 0x0800100, /* GPIO 21 is an INPUT */
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x0000100,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0800100, /* GPIO 23 HI for FM */
                 },
@@ -3499,16 +3391,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 6,
                         .amux   = LINE1,
                 }},
@@ -3523,33 +3414,31 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = 3,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 7,
                         .amux = 4,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = 2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 0,
                         .amux = 2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
 /*                      .gpio = 0x00300001,*/
                         .gpio = 0x20000,
 
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = 0,
                 },
         },
@@ -3562,32 +3451,30 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = 3,
-                        .tv   = 1,
                 },{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 7,
                         .amux = 4,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = 2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 0,
                         .amux = 2,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x20000,
 
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = 0,
                 },
         },
@@ -3600,29 +3487,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x7000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = 1,
-                        .tv   = 1,
                         .gpio = 0x50000,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = 2,
                         .gpio = 0x2000,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = 2,
                         .gpio = 0x2000,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .vmux = 1,
                         .amux = 1,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .gpio = 0xf000,
                         .amux = 0,
                 },
@@ -3635,26 +3521,25 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = 0x61,
                 .radio_addr     = 0x60,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .vmux = 1,
                         .amux = LINE1,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                         .gpio = 0x43000,
                 },
@@ -3668,16 +3553,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 6,
                         .amux   = LINE1,
                 }},
@@ -3693,21 +3577,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 },{
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 }},
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -3721,16 +3604,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 1<<21,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE2,
                 }},
@@ -3746,10 +3628,9 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                         .gpio   = 0x0200000,
                 }},
         },
@@ -3764,29 +3645,28 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 21,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x0000000,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -3800,26 +3680,25 @@ struct saa7134_board saa7134_boards[] = {
                .radio_addr     = ADDR_UNSET,
                .gpiomask       = 1 << 21,
                .inputs         = {{
-                       .name = name_tv,
+                       .type = SAA7134_INPUT_TV,
                        .vmux = 1,
                        .amux = TV,
-                       .tv   = 1,
                        .gpio = 0x0000000,
                }, {
-                       .name = name_comp1,
+                       .type = SAA7134_INPUT_COMPOSITE1,
                        .vmux = 3,
                        .amux = LINE2,
                }, {
-                       .name = name_comp2,
+                       .type = SAA7134_INPUT_COMPOSITE2,
                        .vmux = 0,
                        .amux = LINE2,
                }, {
-                       .name = name_svideo,
+                       .type = SAA7134_INPUT_SVIDEO,
                        .vmux = 8,
                        .amux = LINE2,
                } },
                .radio = {
-                       .name = name_radio,
+                       .type = SAA7134_INPUT_RADIO,
                        .amux = TV,
                        .gpio = 0x0200000,
                },
@@ -3832,25 +3711,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 0,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                 },
         },
@@ -3864,24 +3742,23 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x7000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x2000,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x2000,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x3000,
                 },
@@ -3896,10 +3773,9 @@ struct saa7134_board saa7134_boards[] = {
                 .tda829x_conf   = { .lna_cfg = TDA8290_LNA_OFF },
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv, /* FIXME: analog tv untested */
+                        .type = SAA7134_INPUT_TV, /* FIXME: analog tv untested */
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 }},
         },
         [SAA7134_BOARD_AVERMEDIA_M135A] = {
@@ -3912,26 +3788,25 @@ struct saa7134_board saa7134_boards[] = {
                 .tda829x_conf   = { .lna_cfg = TDA8290_LNA_GP0_HIGH_OFF },
                 .gpiomask       = 0x020200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x00200000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x01,
                 },
@@ -3946,26 +3821,25 @@ struct saa7134_board saa7134_boards[] = {
                 .tda829x_conf   = { .lna_cfg = TDA8290_LNA_OFF },
                 .gpiomask       = 0x020200000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x00200000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x01,
                 },
@@ -3981,21 +3855,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -4010,18 +3883,17 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_BEHOLD_403FM] = {
@@ -4035,21 +3907,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4065,18 +3936,17 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
         },
         [SAA7134_BOARD_BEHOLD_405FM] = {
@@ -4092,21 +3962,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4122,20 +3991,19 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0xc0c000,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                         .gpio = 0xc0c000,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv = 1,
                         .gpio = 0xc0c000,
                 }},
         },
@@ -4151,24 +4019,23 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs = {{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0xc0c000,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                         .gpio = 0xc0c000,
                 },{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv = 1,
                         .gpio = 0xc0c000,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0xc0c000,
                 },
@@ -4185,16 +4052,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
@@ -4211,25 +4077,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4246,25 +4111,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4280,21 +4144,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                         .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4311,21 +4174,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                         .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4342,21 +4204,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                         .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4372,24 +4233,23 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x000A8004,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x000A8004,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                         .gpio = 0x000A8000,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x000A8000,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x000A8000,
                 },
@@ -4404,21 +4264,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4432,21 +4291,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4460,21 +4318,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4488,21 +4345,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4517,21 +4373,20 @@ struct saa7134_board saa7134_boards[] = {
                 .rds_addr       = 0x10,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4546,21 +4401,20 @@ struct saa7134_board saa7134_boards[] = {
                 .rds_addr       = 0x10,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4575,21 +4429,20 @@ struct saa7134_board saa7134_boards[] = {
                 .rds_addr       = 0x10,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4604,21 +4457,20 @@ struct saa7134_board saa7134_boards[] = {
                 .rds_addr       = 0x10,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 },{
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }},
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -4636,21 +4488,20 @@ struct saa7134_board saa7134_boards[] = {
                 .empress_addr   = 0x20,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mpeg  = SAA7134_MPEG_EMPRESS,
@@ -4673,21 +4524,20 @@ struct saa7134_board saa7134_boards[] = {
                 .empress_addr   = 0x20,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mpeg  = SAA7134_MPEG_EMPRESS,
@@ -4712,21 +4562,20 @@ struct saa7134_board saa7134_boards[] = {
                 .empress_addr   = 0x20,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
                 .mpeg  = SAA7134_MPEG_EMPRESS,
@@ -4747,21 +4596,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,            /* untested */
                         .amux   = LINE1,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -4776,30 +4624,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0xf000,
                 .inputs         = {{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE2,
                         .gpio = 0x0000,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x2000,
-                        .tv = 1
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x2000,
         } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x1000,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE2,
                         .gpio = 0x6000,
                 },
@@ -4813,11 +4659,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 } },
@@ -4832,16 +4678,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF },
                 .mpeg         = SAA7134_MPEG_DVB,
                 .inputs       = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
@@ -4857,21 +4702,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -4885,21 +4729,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                  .mpeg           = SAA7134_MPEG_DVB,
                  .inputs         = {{
-                         .name = name_tv,
+                         .type = SAA7134_INPUT_TV,
                          .vmux = 1,
                          .amux = TV,
-                         .tv   = 1,
                  }, {
-                         .name = name_comp1,
+                         .type = SAA7134_INPUT_COMPOSITE1,
                          .vmux = 3,
                          .amux = LINE1,
                  }, {
-                         .name = name_svideo,
+                         .type = SAA7134_INPUT_SVIDEO,
                          .vmux = 8,
                          .amux = LINE2,
                  } },
                  .radio = {
-                         .name = name_radio,
+                         .type = SAA7134_INPUT_RADIO,
                          .amux = TV,
                  },
         },
@@ -4912,21 +4755,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 0,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -4938,16 +4780,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
@@ -4962,21 +4803,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE2,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 }
         },
@@ -4990,11 +4830,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                 } },
@@ -5009,21 +4849,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 4,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -5038,21 +4877,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -5067,21 +4905,20 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 21,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -5097,21 +4934,20 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 21,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0200000,
                 },
@@ -5125,29 +4961,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x801a8087,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = LINE2,
-                        .tv     = 1,
                         .gpio   = 0x624000,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 1,
                         .amux   = LINE1,
                         .gpio   = 0x624000,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 1,
                         .amux   = LINE1,
                         .gpio   = 0x624000,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = LINE2,
                         .gpio   = 0x624001,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                 },
         },
@@ -5161,16 +4996,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 4,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
@@ -5186,25 +5020,24 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .gpiomask       = 0x0200000,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE2,
                 }, {
-                        .name   = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux   = 0,
                         .amux   = LINE2,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0200000,
                 },
@@ -5218,30 +5051,29 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = 0x60,
                 .gpiomask       = 0x80000700,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = LINE2,
-                        .tv     = 1,
                         .gpio   = 0x100,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                         .gpio   = 0x200,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                         .gpio   = 0x200,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .vmux   = 1,
                         .amux   = LINE1,
                         .gpio   = 0x100,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .vmux = 8,
                         .amux = 2,
                 },
@@ -5257,18 +5089,17 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .ts_type        = SAA7134_MPEG_TS_PARALLEL,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
 #if 0   /* FIXME */
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                         .gpio   = 0x200,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                         .gpio   = 0x200,
@@ -5276,14 +5107,14 @@ struct saa7134_board saa7134_boards[] = {
                 } },
 #if 0
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .vmux   = 1,
                         .amux   = LINE1,
                         .gpio   = 0x100,
                 },
 #endif
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .vmux = 0,
                         .amux = TV,
                 },
@@ -5298,24 +5129,23 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 0x00300003,
                 /* .gpiomask       = 0x8c240003, */
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x01,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                         .amux = LINE1,
                         .gpio = 0x02,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x00300001,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                         .gpio = 0x01,
                 },
@@ -5331,29 +5161,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x03,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                         .gpio = 0x00,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x00,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                         .gpio = 0x00,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                         .gpio = 0x01,
                 },
                 .mute  = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                         .gpio = 0x00,
                 },
@@ -5368,11 +5197,11 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = { {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8, /* Not tested */
                         .amux   = LINE1
                 } },
@@ -5387,21 +5216,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 2,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 9,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -5416,13 +5244,12 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .ts_type        = SAA7134_MPEG_TS_PARALLEL,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 } },
                 .radio = {      /* untested */
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -5436,16 +5263,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 4,
                         .amux   = LINE2,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 } },
@@ -5459,10 +5285,10 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                 } },
         },
@@ -5479,25 +5305,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT,
                 .gpiomask       = 0x00008000,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE2,
                 },
         },
@@ -5512,7 +5337,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr   = ADDR_UNSET,
                 .gpiomask      = 0x389c00,
                 .inputs       = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x01fc00,
@@ -5529,21 +5354,20 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .ts_type        = SAA7134_MPEG_TS_PARALLEL,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 2,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 9,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -5556,21 +5380,20 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 2,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 9,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                 },
         },
@@ -5584,16 +5407,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 3,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE2,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 } },
@@ -5607,25 +5429,24 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = 0x60,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = TV,
                 },
         },
@@ -5642,29 +5463,28 @@ struct saa7134_board saa7134_boards[] = {
                 .mpeg           = SAA7134_MPEG_DVB,
                 .ts_type        = SAA7134_MPEG_TS_PARALLEL,
                 .inputs         = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                         .gpio   = 0x00050000,
                 }, {
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 3,
                         .amux   = LINE1,
                         .gpio   = 0x00050000,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                         .gpio   = 0x00050000,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x00050000,
                 },
                 .mute = {
-                        .name   = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .vmux   = 0,
                         .amux   = TV,
                         .gpio   = 0x00050000,
@@ -5681,21 +5501,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x00008000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -5710,21 +5529,20 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x00008000,
                 .inputs         = { {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 1,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -5736,15 +5554,15 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .inputs         = {{
-                        .name   = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux   = 0,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_comp3,
+                        .type = SAA7134_INPUT_COMPOSITE3,
                         .vmux   = 2,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE1,
                 } },
@@ -5760,21 +5578,20 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 21,
                 .ts_type        = SAA7134_MPEG_TS_PARALLEL,
                 .inputs = { {
-                        .name   = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux   = 1,
                         .amux   = TV,
-                        .tv     = 1,
                 }, {
-                        .name   = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux   = 3,
                         .amux   = LINE1,
                 }, {
-                        .name   = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux   = 8,
                         .amux   = LINE2,
                 } },
                 .radio = {
-                        .name   = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux   = TV,
                         .gpio   = 0x0000000,
                 },
@@ -5790,7 +5607,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr   = ADDR_UNSET,
                 .gpiomask      = 0x618E700,
                 .inputs       = {{
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE1,
                         .gpio = 0x6010000,
@@ -5809,21 +5626,20 @@ struct saa7134_board saa7134_boards[] = {
                 .gpiomask       = 1 << 11,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp,
+                        .type = SAA7134_INPUT_COMPOSITE,
                         .vmux = 4,
                         .amux = LINE1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE1,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = TV,
                         .gpio = 0x0000800,
                 },
@@ -5837,16 +5653,15 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_GO7007,
                 .inputs         = { {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 3,
                         .amux = TV,
-                        .tv   = 1,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 6,
                 .amux = LINE1,
                 } },
@@ -5862,25 +5677,24 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
-                        .name = name_tv,
+                        .type = SAA7134_INPUT_TV,
                         .vmux = 1,
                         .amux = LINE2,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 0,
                         .amux = LINE2,
                 }, {
-                        .name = name_comp2,
+                        .type = SAA7134_INPUT_COMPOSITE2,
                         .vmux = 3,
                         .amux = LINE2,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                 } },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                 },
         },
@@ -5893,29 +5707,28 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x0d,
                 .inputs         = {{
-                        .name = name_tv_mono,
+                        .type = SAA7134_INPUT_TV_MONO,
                         .vmux = 1,
                         .amux = LINE1,
                         .gpio = 0x00,
-                        .tv   = 1,
                 }, {
-                        .name = name_comp1,
+                        .type = SAA7134_INPUT_COMPOSITE1,
                         .vmux = 3,
                         .amux = LINE2,
                         .gpio = 0x08,
                 }, {
-                        .name = name_svideo,
+                        .type = SAA7134_INPUT_SVIDEO,
                         .vmux = 8,
                         .amux = LINE2,
                         .gpio = 0x08,
                 } },
                 .radio = {
-                        .name = name_radio,
+                        .type = SAA7134_INPUT_RADIO,
                         .amux = LINE1,
                         .gpio = 0x04,
                 },
                 .mute = {
-                        .name = name_mute,
+                        .type = SAA7134_INPUT_MUTE,
                         .amux = LINE1,
                         .gpio = 0x08,
                 },
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index e227b02cc122..42bc4172febd 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -112,7 +112,7 @@ int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
                 printk(KERN_DEBUG pr_fmt("irq: " fmt), ## arg); \
         } while (0)
 
-void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
+void saa7134_track_gpio(struct saa7134_dev *dev, const char *msg)
 {
         unsigned long mode,status;
 
@@ -806,6 +806,153 @@ static void must_configure_manually(int has_eeprom)
         }
 }
 
+static void saa7134_unregister_media_device(struct saa7134_dev *dev)
+{
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        if (!dev->media_dev)
+                return;
+        media_device_unregister(dev->media_dev);
+        media_device_cleanup(dev->media_dev);
+        kfree(dev->media_dev);
+        dev->media_dev = NULL;
+#endif
+}
+
+static void saa7134_media_release(struct saa7134_dev *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        int i;
+
+        for (i = 0; i < SAA7134_INPUT_MAX + 1; i++)
+                media_device_unregister_entity(&dev->input_ent[i]);
+#endif
+}
+
+static void saa7134_create_entities(struct saa7134_dev *dev)
+{
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        int ret, i;
+        struct media_entity *entity;
+        struct media_entity *decoder = NULL;
+
+        /* Check if it is using an external analog TV demod */
+        media_device_for_each_entity(entity, dev->media_dev) {
+                if (entity->function == MEDIA_ENT_F_ATV_DECODER)
+                        decoder = entity;
+                        break;
+        }
+
+        /*
+         * saa713x is not using an external ATV demod.
+         * Register the internal one
+         */
+        if (!decoder) {
+                dev->demod.name = "saa713x";
+                dev->demod_pad[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+                dev->demod_pad[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
+                dev->demod_pad[DEMOD_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
+                dev->demod.function = MEDIA_ENT_F_ATV_DECODER;
+
+                ret = media_entity_pads_init(&dev->demod, DEMOD_NUM_PADS,
+                                             dev->demod_pad);
+                if (ret < 0)
+                        pr_err("failed to initialize demod pad!\n");
+
+                ret = media_device_register_entity(dev->media_dev, &dev->demod);
+                if (ret < 0)
+                        pr_err("failed to register demod entity!\n");
+
+                dev->decoder = &dev->demod;
+        } else {
+                dev->decoder = decoder;
+        }
+
+        /* Initialize Video, VBI and Radio pads */
+        dev->video_pad.flags = MEDIA_PAD_FL_SINK;
+        ret = media_entity_pads_init(&dev->video_dev->entity, 1,
+                                     &dev->video_pad);
+        if (ret < 0)
+                pr_err("failed to initialize video media entity!\n");
+
+        dev->vbi_pad.flags = MEDIA_PAD_FL_SINK;
+        ret = media_entity_pads_init(&dev->vbi_dev->entity, 1,
+                                        &dev->vbi_pad);
+        if (ret < 0)
+                pr_err("failed to initialize vbi media entity!\n");
+
+        /* Create entities for each input connector */
+        for (i = 0; i < SAA7134_INPUT_MAX; i++) {
+                struct media_entity *ent = &dev->input_ent[i];
+                struct saa7134_input *in = &card_in(dev, i);
+
+                if (in->type == SAA7134_NO_INPUT)
+                        break;
+
+                /* This input uses the S-Video connector */
+                if (in->type == SAA7134_INPUT_COMPOSITE_OVER_SVIDEO)
+                        continue;
+
+                ent->name = saa7134_input_name[in->type];
+                ent->flags = MEDIA_ENT_FL_CONNECTOR;
+                dev->input_pad[i].flags = MEDIA_PAD_FL_SOURCE;
+
+                switch (in->type) {
+                case SAA7134_INPUT_COMPOSITE:
+                case SAA7134_INPUT_COMPOSITE0:
+                case SAA7134_INPUT_COMPOSITE1:
+                case SAA7134_INPUT_COMPOSITE2:
+                case SAA7134_INPUT_COMPOSITE3:
+                case SAA7134_INPUT_COMPOSITE4:
+                        ent->function = MEDIA_ENT_F_CONN_COMPOSITE;
+                        break;
+                case SAA7134_INPUT_SVIDEO:
+                case SAA7134_INPUT_SVIDEO0:
+                case SAA7134_INPUT_SVIDEO1:
+                        ent->function = MEDIA_ENT_F_CONN_SVIDEO;
+                        break;
+                default:
+                        /*
+                         * SAA7134_INPUT_TV and SAA7134_INPUT_TV_MONO.
+                         *
+                         * Please notice that neither SAA7134_INPUT_MUTE or
+                         * SAA7134_INPUT_RADIO are defined at
+                         * saa7134_board.input.
+                         */
+                        ent->function = MEDIA_ENT_F_CONN_RF;
+                        break;
+                }
+
+                ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
+                if (ret < 0)
+                        pr_err("failed to initialize input pad[%d]!\n", i);
+
+                ret = media_device_register_entity(dev->media_dev, ent);
+                if (ret < 0)
+                        pr_err("failed to register input entity %d!\n", i);
+        }
+
+        /* Create input for Radio RF connector */
+        if (card_has_radio(dev)) {
+                struct saa7134_input *in = &saa7134_boards[dev->board].radio;
+                struct media_entity *ent = &dev->input_ent[i];
+
+                ent->name = saa7134_input_name[in->type];
+                ent->flags = MEDIA_ENT_FL_CONNECTOR;
+                dev->input_pad[i].flags = MEDIA_PAD_FL_SOURCE;
+                ent->function = MEDIA_ENT_F_CONN_RF;
+
+                ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
+                if (ret < 0)
+                        pr_err("failed to initialize input pad[%d]!\n", i);
+
+                ret = media_device_register_entity(dev->media_dev, ent);
+                if (ret < 0)
+                        pr_err("failed to register input entity %d!\n", i);
+        }
+#endif
+}
+
 static struct video_device *vdev_init(struct saa7134_dev *dev,
                                       struct video_device *template,
                                       char *type)
@@ -826,6 +973,8 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
 
 static void saa7134_unregister_video(struct saa7134_dev *dev)
 {
+        saa7134_media_release(dev);
+
         if (dev->video_dev) {
                 if (video_is_registered(dev->video_dev))
                         video_unregister_device(dev->video_dev);
@@ -889,6 +1038,18 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         if (NULL == dev)
                 return -ENOMEM;
 
+        dev->nr = saa7134_devcount;
+        sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr);
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        dev->media_dev = v4l2_mc_pci_media_device_init(pci_dev, dev->name);
+        if (!dev->media_dev) {
+                err = -ENOMEM;
+                goto fail0;
+        }
+        dev->v4l2_dev.mdev = dev->media_dev;
+#endif
+
         err = v4l2_device_register(&pci_dev->dev, &dev->v4l2_dev);
         if (err)
                 goto fail0;
@@ -900,9 +1061,6 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
                 goto fail1;
         }
 
-        dev->nr = saa7134_devcount;
-        sprintf(dev->name,"saa%x[%d]",pci_dev->device,dev->nr);
-
         /* pci quirks */
         if (pci_pci_problems) {
                 if (pci_pci_problems & PCIPCI_TRITON)
@@ -1102,6 +1260,15 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
                        dev->name, video_device_node_name(dev->radio_dev));
         }
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+        saa7134_create_entities(dev);
+
+        err = v4l2_mc_create_media_graph(dev->media_dev);
+        if (err) {
+                pr_err("failed to create media graph\n");
+                goto fail5;
+        }
+#endif
         /* everything worked */
         saa7134_devcount++;
 
@@ -1109,6 +1276,18 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
                 saa7134_dmasound_init(dev);
 
         request_submodules(dev);
+
+        /*
+         * Do it at the end, to reduce dynamic configuration changes during
+         * the device init. Yet, as request_modules() can be async, the
+         * topology will likely change after load the saa7134 subdrivers.
+         */
+#ifdef CONFIG_MEDIA_CONTROLLER
+        err = media_device_register(dev->media_dev);
+        if (err)
+                goto fail5;
+#endif
+
         return 0;
 
  fail5:
@@ -1126,6 +1305,9 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
  fail1:
         v4l2_device_unregister(&dev->v4l2_dev);
  fail0:
+#ifdef CONFIG_MEDIA_CONTROLLER
+        kfree(dev->media_dev);
+#endif
         kfree(dev);
         return err;
 }
@@ -1188,9 +1370,10 @@ static void saa7134_finidev(struct pci_dev *pci_dev)
         release_mem_region(pci_resource_start(pci_dev,0),
                            pci_resource_len(pci_dev,0));
 
-
         v4l2_device_unregister(&dev->v4l2_dev);
 
+        saa7134_unregister_media_device(dev);
+
         /* free memory */
         kfree(dev);
 }
diff --git a/drivers/media/pci/saa7134/saa7134-dvb.c b/drivers/media/pci/saa7134/saa7134-dvb.c
index 101ba8729416..db987e5b93eb 100644
--- a/drivers/media/pci/saa7134/saa7134-dvb.c
+++ b/drivers/media/pci/saa7134/saa7134-dvb.c
@@ -1883,8 +1883,15 @@ static int dvb_init(struct saa7134_dev *dev)
         fe0->dvb.frontend->callback = saa7134_tuner_callback;
 
         /* register everything else */
+#ifndef CONFIG_MEDIA_CONTROLLER_DVB
         ret = vb2_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
-                                        &dev->pci->dev, adapter_nr, 0);
+                                   &dev->pci->dev, NULL,
+                                   adapter_nr, 0);
+#else
+        ret = vb2_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
+                                   &dev->pci->dev, dev->media_dev,
+                                   adapter_nr, 0);
+#endif
 
         /* this sequence is necessary to make the tda1004x load its firmware
          * and to enter analog mode of hybrid boards
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index 56b932c97196..ca417a454d67 100644
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -189,6 +189,7 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
         .vidioc_querybuf                = vb2_ioctl_querybuf,
         .vidioc_qbuf                    = vb2_ioctl_qbuf,
         .vidioc_dqbuf                   = vb2_ioctl_dqbuf,
+        .vidioc_expbuf                  = vb2_ioctl_expbuf,
         .vidioc_streamon                = vb2_ioctl_streamon,
         .vidioc_streamoff               = vb2_ioctl_streamoff,
         .vidioc_g_frequency             = saa7134_g_frequency,
@@ -286,7 +287,7 @@ static int empress_init(struct saa7134_dev *dev)
          * transfers that do not start at the beginning of a page. A USERPTR
          * can start anywhere in a page, so USERPTR support is a no-go.
          */
-        q->io_modes = VB2_MMAP | VB2_READ;
+        q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
         q->drv_priv = &dev->ts_q;
         q->ops = &saa7134_empress_qops;
         q->gfp_flags = GFP_DMA32;
diff --git a/drivers/media/pci/saa7134/saa7134-go7007.c b/drivers/media/pci/saa7134/saa7134-go7007.c
index 8a2abb34186b..2799538e2d7e 100644
--- a/drivers/media/pci/saa7134/saa7134-go7007.c
+++ b/drivers/media/pci/saa7134/saa7134-go7007.c
@@ -378,7 +378,7 @@ static int saa7134_go7007_send_firmware(struct go7007 *go, u8 *data, int len)
         return 0;
 }
 
-static struct go7007_hpi_ops saa7134_go7007_hpi_ops = {
+static const struct go7007_hpi_ops saa7134_go7007_hpi_ops = {
         .interface_reset        = saa7134_go7007_interface_reset,
         .write_interrupt        = saa7134_go7007_write_interrupt,
         .read_interrupt         = saa7134_go7007_read_interrupt,
diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
index 21a579309575..38f94b742e28 100644
--- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
@@ -192,7 +192,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
         in   = dev->input;
         mute = (dev->ctl_mute ||
                 (dev->automute  &&  (&card(dev).radio) != in));
-        if (card(dev).mute.name) {
+        if (card(dev).mute.type) {
                 /*
                  * 7130 - we'll mute using some unconnected audio input
                  * 7134 - we'll probably should switch external mux with gpio
@@ -204,13 +204,14 @@ static void mute_input_7134(struct saa7134_dev *dev)
         if (dev->hw_mute  == mute &&
                 dev->hw_input == in && !dev->insuspend) {
                 audio_dbg(1, "mute/input: nothing to do [mute=%d,input=%s]\n",
-                          mute, in->name);
+                          mute, saa7134_input_name[in->type]);
                 return;
         }
 
         audio_dbg(1, "ctl_mute=%d automute=%d input=%s  =>  mute=%d input=%s\n",
                   dev->ctl_mute, dev->automute,
-                  dev->input->name, mute, in->name);
+                  saa7134_input_name[dev->input->type], mute,
+                  saa7134_input_name[in->type]);
         dev->hw_mute  = mute;
         dev->hw_input = in;
 
@@ -245,7 +246,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
         mask = card(dev).gpiomask;
         saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
         saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
-        saa7134_track_gpio(dev,in->name);
+        saa7134_track_gpio(dev, saa7134_input_name[in->type]);
 }
 
 static void tvaudio_setmode(struct saa7134_dev *dev,
@@ -756,14 +757,14 @@ static int mute_input_7133(struct saa7134_dev *dev)
         if (0 != card(dev).gpiomask) {
                 mask = card(dev).gpiomask;
 
-                if (card(dev).mute.name && dev->ctl_mute)
+                if (card(dev).mute.type && dev->ctl_mute)
                         in = &card(dev).mute;
                 else
                         in = dev->input;
 
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
-                saa7134_track_gpio(dev,in->name);
+                saa7134_track_gpio(dev, saa7134_input_name[in->type]);
         }
 
         return 0;
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index a63c1366a64e..ffa39543eb65 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -409,7 +409,8 @@ static void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm)
 
 static void video_mux(struct saa7134_dev *dev, int input)
 {
-        video_dbg("video input = %d [%s]\n", input, card_in(dev, input).name);
+        video_dbg("video input = %d [%s]\n",
+                  input, saa7134_input_name[card_in(dev, input).type]);
         dev->ctl_input = input;
         set_tvnorm(dev, dev->tvnorm);
         saa7134_tvaudio_setinput(dev, &card_in(dev, input));
@@ -478,8 +479,7 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
 {
         saa7134_set_decoder(dev);
 
-        if (card_in(dev, dev->ctl_input).tv)
-                saa_call_all(dev, video, s_std, dev->tvnorm->id);
+        saa_call_all(dev, video, s_std, dev->tvnorm->id);
         /* Set the correct norm for the saa6752hs. This function
            does nothing if there is no saa6752hs. */
         saa_call_empress(dev, video, s_std, dev->tvnorm->id);
@@ -785,6 +785,63 @@ static int stop_preview(struct saa7134_dev *dev)
         return 0;
 }
 
+/*
+ * Media Controller helper functions
+ */
+
+static int saa7134_enable_analog_tuner(struct saa7134_dev *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev = dev->media_dev;
+        struct media_entity *source;
+        struct media_link *link, *found_link = NULL;
+        int ret, active_links = 0;
+
+        if (!mdev || !dev->decoder)
+                return 0;
+
+        /*
+         * This will find the tuner that is connected into the decoder.
+         * Technically, this is not 100% correct, as the device may be
+         * using an analog input instead of the tuner. However, as we can't
+         * do DVB streaming while the DMA engine is being used for V4L2,
+         * this should be enough for the actual needs.
+         */
+        list_for_each_entry(link, &dev->decoder->links, list) {
+                if (link->sink->entity == dev->decoder) {
+                        found_link = link;
+                        if (link->flags & MEDIA_LNK_FL_ENABLED)
+                                active_links++;
+                        break;
+                }
+        }
+
+        if (active_links == 1 || !found_link)
+                return 0;
+
+        source = found_link->source->entity;
+        list_for_each_entry(link, &source->links, list) {
+                struct media_entity *sink;
+                int flags = 0;
+
+                sink = link->sink->entity;
+
+                if (sink == dev->decoder)
+                        flags = MEDIA_LNK_FL_ENABLED;
+
+                ret = media_entity_setup_link(link, flags);
+                if (ret) {
+                        pr_err("Couldn't change link %s->%s to %s. Error %d\n",
+                               source->name, sink->name,
+                               flags ? "enabled" : "disabled",
+                               ret);
+                        return ret;
+                }
+        }
+#endif
+        return 0;
+}
+
 /* ------------------------------------------------------------------ */
 
 static int buffer_activate(struct saa7134_dev *dev,
@@ -924,6 +981,9 @@ static int queue_setup(struct vb2_queue *q,
         *nplanes = 1;
         sizes[0] = size;
         alloc_ctxs[0] = dev->alloc_ctx;
+
+        saa7134_enable_analog_tuner(dev);
+
         return 0;
 }
 
@@ -1219,10 +1279,13 @@ static int saa7134_g_fmt_vid_cap(struct file *file, void *priv,
         f->fmt.pix.height       = dev->height;
         f->fmt.pix.field        = dev->field;
         f->fmt.pix.pixelformat  = dev->fmt->fourcc;
-        f->fmt.pix.bytesperline =
-                (f->fmt.pix.width * dev->fmt->depth) >> 3;
+        if (dev->fmt->planar)
+                f->fmt.pix.bytesperline = f->fmt.pix.width;
+        else
+                f->fmt.pix.bytesperline =
+                        (f->fmt.pix.width * dev->fmt->depth) / 8;
         f->fmt.pix.sizeimage =
-                f->fmt.pix.height * f->fmt.pix.bytesperline;
+                (f->fmt.pix.height * f->fmt.pix.width * dev->fmt->depth) / 8;
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
         return 0;
 }
@@ -1298,10 +1361,13 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv,
         if (f->fmt.pix.height > maxh)
                 f->fmt.pix.height = maxh;
         f->fmt.pix.width &= ~0x03;
-        f->fmt.pix.bytesperline =
-                (f->fmt.pix.width * fmt->depth) >> 3;
+        if (fmt->planar)
+                f->fmt.pix.bytesperline = f->fmt.pix.width;
+        else
+                f->fmt.pix.bytesperline =
+                        (f->fmt.pix.width * fmt->depth) / 8;
         f->fmt.pix.sizeimage =
-                f->fmt.pix.height * f->fmt.pix.bytesperline;
+                (f->fmt.pix.height * f->fmt.pix.width * fmt->depth) / 8;
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
 
         return 0;
@@ -1381,13 +1447,19 @@ int saa7134_enum_input(struct file *file, void *priv, struct v4l2_input *i)
         n = i->index;
         if (n >= SAA7134_INPUT_MAX)
                 return -EINVAL;
-        if (NULL == card_in(dev, i->index).name)
+        if (card_in(dev, i->index).type == SAA7134_NO_INPUT)
                 return -EINVAL;
         i->index = n;
-        i->type  = V4L2_INPUT_TYPE_CAMERA;
-        strcpy(i->name, card_in(dev, n).name);
-        if (card_in(dev, n).tv)
+        strcpy(i->name, saa7134_input_name[card_in(dev, n).type]);
+        switch (card_in(dev, n).type) {
+        case SAA7134_INPUT_TV:
+        case SAA7134_INPUT_TV_MONO:
                 i->type = V4L2_INPUT_TYPE_TUNER;
+                break;
+        default:
+                i->type  = V4L2_INPUT_TYPE_CAMERA;
+                break;
+        }
         if (n == dev->ctl_input) {
                 int v1 = saa_readb(SAA7134_STATUS_VIDEO1);
                 int v2 = saa_readb(SAA7134_STATUS_VIDEO2);
@@ -1419,7 +1491,7 @@ int saa7134_s_input(struct file *file, void *priv, unsigned int i)
 
         if (i >= SAA7134_INPUT_MAX)
                 return -EINVAL;
-        if (NULL == card_in(dev, i).name)
+        if (card_in(dev, i).type == SAA7134_NO_INPUT)
                 return -EINVAL;
         video_mux(dev, i);
         return 0;
@@ -1656,12 +1728,13 @@ int saa7134_g_tuner(struct file *file, void *priv,
                 return -EINVAL;
         memset(t, 0, sizeof(*t));
         for (n = 0; n < SAA7134_INPUT_MAX; n++) {
-                if (card_in(dev, n).tv)
+                if (card_in(dev, n).type == SAA7134_INPUT_TV ||
+                    card_in(dev, n).type == SAA7134_INPUT_TV_MONO)
                         break;
         }
         if (n == SAA7134_INPUT_MAX)
                 return -EINVAL;
-        if (NULL != card_in(dev, n).name) {
+        if (card_in(dev, n).type != SAA7134_NO_INPUT) {
                 strcpy(t->name, "Television");
                 t->type = V4L2_TUNER_ANALOG_TV;
                 saa_call_all(dev, tuner, g_tuner, t);
@@ -1906,6 +1979,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querybuf                = vb2_ioctl_querybuf,
         .vidioc_qbuf                    = vb2_ioctl_qbuf,
         .vidioc_dqbuf                   = vb2_ioctl_dqbuf,
+        .vidioc_expbuf                  = vb2_ioctl_expbuf,
         .vidioc_s_std                   = saa7134_s_std,
         .vidioc_g_std                   = saa7134_g_std,
         .vidioc_querystd                = saa7134_querystd,
@@ -2089,7 +2163,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
          * USERPTR support is a no-go unless the application knows about these
          * limitations and has special support for this.
          */
-        q->io_modes = VB2_MMAP | VB2_READ;
+        q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
         if (saa7134_userptr)
                 q->io_modes |= VB2_USERPTR;
         q->drv_priv = &dev->video_q;
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 5938bc781999..8936568fab94 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -361,12 +361,29 @@ struct saa7134_card_ir {
 #define SET_CLOCK_INVERTED                      (1 << 2)
 #define SET_VSYNC_OFF                           (1 << 3)
 
+enum saa7134_input_types {
+        SAA7134_NO_INPUT = 0,
+        SAA7134_INPUT_MUTE,
+        SAA7134_INPUT_RADIO,
+        SAA7134_INPUT_TV,
+        SAA7134_INPUT_TV_MONO,
+        SAA7134_INPUT_COMPOSITE,
+        SAA7134_INPUT_COMPOSITE0,
+        SAA7134_INPUT_COMPOSITE1,
+        SAA7134_INPUT_COMPOSITE2,
+        SAA7134_INPUT_COMPOSITE3,
+        SAA7134_INPUT_COMPOSITE4,
+        SAA7134_INPUT_SVIDEO,
+        SAA7134_INPUT_SVIDEO0,
+        SAA7134_INPUT_SVIDEO1,
+        SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
+};
+
 struct saa7134_input {
-        char                    *name;
-        unsigned int            vmux;
-        enum saa7134_audio_in   amux;
-        unsigned int            gpio;
-        unsigned int            tv:1;
+        enum saa7134_input_types type;
+        unsigned int             vmux;
+        enum saa7134_audio_in    amux;
+        unsigned int             gpio;
 };
 
 enum saa7134_mpeg_type {
@@ -410,7 +427,7 @@ struct saa7134_board {
         unsigned int            ts_force_val:1;
 };
 
-#define card_has_radio(dev)   (NULL != saa7134_boards[dev->board].radio.name)
+#define card_has_radio(dev)   (SAA7134_NO_INPUT != saa7134_boards[dev->board].radio.type)
 #define card_is_empress(dev)  (SAA7134_MPEG_EMPRESS == saa7134_boards[dev->board].mpeg)
 #define card_is_dvb(dev)      (SAA7134_MPEG_DVB     == saa7134_boards[dev->board].mpeg)
 #define card_is_go7007(dev)   (SAA7134_MPEG_GO7007  == saa7134_boards[dev->board].mpeg)
@@ -654,6 +671,19 @@ struct saa7134_dev {
         /* I2C keyboard data */
         struct IR_i2c_init_data    init_data;
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *media_dev;
+
+        struct media_entity input_ent[SAA7134_INPUT_MAX + 1];
+        struct media_pad input_pad[SAA7134_INPUT_MAX + 1];
+
+        struct media_entity demod;
+        struct media_pad demod_pad[DEMOD_NUM_PADS];
+
+        struct media_pad video_pad, vbi_pad;
+        struct media_entity *decoder;
+#endif
+
 #if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
         /* SAA7134_MPEG_DVB only */
         struct vb2_dvb_frontends frontends;
@@ -727,7 +757,7 @@ extern struct mutex saa7134_devlist_lock;
 extern int saa7134_no_overlay;
 extern bool saa7134_userptr;
 
-void saa7134_track_gpio(struct saa7134_dev *dev, char *msg);
+void saa7134_track_gpio(struct saa7134_dev *dev, const char *msg);
 void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value);
 
 #define SAA7134_PGTABLE_SIZE 4096
@@ -760,6 +790,7 @@ extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 /* saa7134-cards.c                                             */
 
 extern struct saa7134_board saa7134_boards[];
+extern const char * const saa7134_input_name[];
 extern const unsigned int saa7134_bcount;
 extern struct pci_device_id saa7134_pci_tbl[];
 
diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index a69dc6a0752b..18d229fa65cf 100644
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -1739,7 +1739,7 @@ static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct fir
 #endif
 }
 
-static struct sp8870_config alps_tdlb7_config = {
+static const struct sp8870_config alps_tdlb7_config = {
 
         .demod_address = 0x71,
         .request_firmware = alps_tdlb7_request_firmware,
diff --git a/drivers/media/pci/ttpci/budget.c b/drivers/media/pci/ttpci/budget.c
index de54310a2660..9f48100227f1 100644
--- a/drivers/media/pci/ttpci/budget.c
+++ b/drivers/media/pci/ttpci/budget.c
@@ -644,7 +644,7 @@ static void frontend_init(struct budget *budget)
                 }
 
         case 0x101c: { /* TT S2-1600 */
-                        struct stv6110x_devctl *ctl;
+                        const struct stv6110x_devctl *ctl;
                         saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
                         msleep(50);
                         saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
@@ -697,7 +697,7 @@ static void frontend_init(struct budget *budget)
                 break;
 
         case 0x1020: { /* Omicom S2 */
-                        struct stv6110x_devctl *ctl;
+                        const struct stv6110x_devctl *ctl;
                         saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
                         msleep(50);
                         saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8b89ebe16d94..201f5c296a95 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -54,15 +54,6 @@ config VIDEO_VIU
           Say Y here if you want to enable VIU device on MPC5121e Rev2+.
           In doubt, say N.
 
-config VIDEO_TIMBERDALE
-        tristate "Support for timberdale Video In/LogiWIN"
-        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && HAS_DMA
-        depends on (MFD_TIMBERDALE && TIMB_DMA) || COMPILE_TEST
-        select VIDEO_ADV7180
-        select VIDEOBUF_DMA_CONTIG
-        ---help---
-          Add support for the Video In peripherial of the timberdale FPGA.
-
 config VIDEO_M32R_AR
         tristate "AR devices"
         depends on VIDEO_V4L2
@@ -120,6 +111,19 @@ source "drivers/media/platform/s5p-tv/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
 
+config VIDEO_TI_CAL
+        tristate "TI CAL (Camera Adaptation Layer) driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        depends on SOC_DRA7XX || COMPILE_TEST
+        depends on HAS_DMA
+        select VIDEOBUF2_DMA_CONTIG
+        default n
+        ---help---
+          Support for the TI CAL (Camera Adaptation Layer) block
+          found on DRA72X SoC.
+          In TI Technical Reference Manual this module is referred as
+          Camera Interface Subsystem (CAMSS).
+
 endif # V4L_PLATFORM_DRIVERS
 
 menuconfig V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index efa0295af87b..bbb7bd1eb268 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-obj-$(CONFIG_VIDEO_TIMBERDALE)  += timblogiw.o
 obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 
 obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
@@ -18,6 +17,8 @@ obj-$(CONFIG_VIDEO_VIM2M)		+= vim2m.o
 
 obj-$(CONFIG_VIDEO_TI_VPE)              += ti-vpe/
 
+obj-$(CONFIG_VIDEO_TI_CAL)              += ti-vpe/
+
 obj-$(CONFIG_VIDEO_MX2_EMMAPRP)         += mx2_emmaprp.o
 obj-$(CONFIG_VIDEO_CODA)                += coda/
 
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 7d28899f89ce..6efe9d002961 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1342,7 +1342,7 @@ static void coda_finish_encode(struct coda_ctx *ctx)
 
         /* Calculate bytesused field */
         if (dst_buf->sequence == 0) {
-                vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, wr_ptr - start_ptr +
                                         ctx->vpu_header_size[0] +
                                         ctx->vpu_header_size[1] +
                                         ctx->vpu_header_size[2]);
diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index ffbefdff6b5e..6fba32bec974 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -261,7 +261,7 @@ static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params)
          */
         if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) {
                 if (fpc_physaddr != NULL) {
-                        free_pages((unsigned long)fpc_physaddr,
+                        free_pages((unsigned long)fpc_virtaddr,
                                    get_order
                                    (config_params->fault_pxl.fp_num *
                                    FP_NUM_BYTES));
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index 93782f15b825..a600e32e2543 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -700,7 +700,7 @@ static unsigned int gsc_m2m_poll(struct file *file,
 {
         struct gsc_ctx *ctx = fh_to_ctx(file->private_data);
         struct gsc_dev *gsc = ctx->gsc_dev;
-        int ret;
+        unsigned int ret;
 
         if (mutex_lock_interruptible(&gsc->lock))
                 return -ERESTARTSYS;
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index e79ddbb1e14f..feb521f28e14 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -389,13 +389,19 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
         struct fimc_source_info *pd = &fmd->sensor[index].pdata;
         struct device_node *rem, *ep, *np;
         struct v4l2_of_endpoint endpoint;
+        int ret;
 
         /* Assume here a port node can have only one endpoint node. */
         ep = of_get_next_child(port, NULL);
         if (!ep)
                 return 0;
 
-        v4l2_of_parse_endpoint(ep, &endpoint);
+        ret = v4l2_of_parse_endpoint(ep, &endpoint);
+        if (ret) {
+                of_node_put(ep);
+                return ret;
+        }
+
         if (WARN_ON(endpoint.base.port == 0) || index >= FIMC_MAX_SENSORS)
                 return -EINVAL;
 
@@ -486,8 +492,10 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd)
                         continue;
 
                 ret = fimc_md_parse_port_node(fmd, port, index);
-                if (ret < 0)
+                if (ret < 0) {
+                        of_node_put(node);
                         goto rpm_put;
+                }
                 index++;
         }
 
@@ -498,8 +506,10 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd)
 
         for_each_child_of_node(ports, node) {
                 ret = fimc_md_parse_port_node(fmd, node, index);
-                if (ret < 0)
+                if (ret < 0) {
+                        of_node_put(node);
                         break;
+                }
                 index++;
         }
 rpm_put:
@@ -707,8 +717,10 @@ static int fimc_md_register_platform_entities(struct fimc_md *fmd,
                         ret = fimc_md_register_platform_entity(fmd, pdev,
                                                         plat_entity);
                 put_device(&pdev->dev);
-                if (ret < 0)
+                if (ret < 0) {
+                        of_node_put(node);
                         break;
+                }
         }
 
         return ret;
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index ac5e50e595be..bd5c46c3d4b7 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -736,6 +736,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
 {
         struct device_node *node = pdev->dev.of_node;
         struct v4l2_of_endpoint endpoint;
+        int ret;
 
         if (of_property_read_u32(node, "clock-frequency",
                                  &state->clk_frequency))
@@ -751,7 +752,9 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
                 return -EINVAL;
         }
         /* Get port node and validate MIPI-CSI channel id. */
-        v4l2_of_parse_endpoint(node, &endpoint);
+        ret = v4l2_of_parse_endpoint(node, &endpoint);
+        if (ret)
+                goto err;
 
         state->index = endpoint.base.port - FIMC_INPUT_MIPI_CSI2_0;
         if (state->index >= CSIS_MAX_ENTITIES)
@@ -764,9 +767,10 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
                                         "samsung,csis-wclk");
 
         state->num_lanes = endpoint.bus.mipi_csi2.num_data_lanes;
-        of_node_put(node);
 
-        return 0;
+err:
+        of_node_put(node);
+        return ret;
 }
 
 static int s5pcsis_pm_resume(struct device *dev, bool runtime);
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 0bcfa553c1aa..f9e5245f26ac 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -449,7 +449,7 @@ void omap3isp_configure_bridge(struct isp_device *isp,
         case CCDC_INPUT_PARALLEL:
                 ispctrl_val |= ISPCTRL_PAR_SER_CLK_SEL_PARALLEL;
                 ispctrl_val |= parcfg->clk_pol << ISPCTRL_PAR_CLK_POL_SHIFT;
-                shift += parcfg->data_lane_shift * 2;
+                shift += parcfg->data_lane_shift;
                 break;
 
         case CCDC_INPUT_CSI2A:
@@ -2235,8 +2235,11 @@ static int isp_of_parse_node(struct device *dev, struct device_node *node,
         struct isp_bus_cfg *buscfg = &isd->bus;
         struct v4l2_of_endpoint vep;
         unsigned int i;
+        int ret;
 
-        v4l2_of_parse_endpoint(node, &vep);
+        ret = v4l2_of_parse_endpoint(node, &vep);
+        if (ret)
+                return ret;
 
         dev_dbg(dev, "parsing endpoint %s, interface %u\n", node->full_name,
                 vep.base.port);
@@ -2528,12 +2531,13 @@ static int isp_probe(struct platform_device *pdev)
         }
 
         /* Interrupt */
-        isp->irq_num = platform_get_irq(pdev, 0);
-        if (isp->irq_num <= 0) {
+        ret = platform_get_irq(pdev, 0);
+        if (ret <= 0) {
                 dev_err(isp->dev, "No IRQ resource\n");
                 ret = -ENODEV;
                 goto error_iommu;
         }
+        isp->irq_num = ret;
 
         if (devm_request_irq(isp->dev, isp->irq_num, isp_isr, IRQF_SHARED,
                              "OMAP3 ISP", isp)) {
@@ -2599,6 +2603,7 @@ static const struct of_device_id omap3isp_of_table[] = {
         { .compatible = "ti,omap3-isp" },
         { },
 };
+MODULE_DEVICE_TABLE(of, omap3isp_of_table);
 
 static struct platform_driver omap3isp_driver = {
         .probe = isp_probe,
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index bb3974c98e37..882310eb45cc 100644
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -2421,7 +2421,7 @@ static int ccdc_link_validate(struct v4l2_subdev *sd,
                         &((struct isp_bus_cfg *)
                           media_entity_to_v4l2_subdev(link->source->entity)
                           ->host_priv)->bus.parallel;
-                parallel_shift = parcfg->data_lane_shift * 2;
+                parallel_shift = parcfg->data_lane_shift;
         } else {
                 parallel_shift = 0;
         }
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
index 84a96670e2e7..ac30a0f83780 100644
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -1480,13 +1480,6 @@ static void preview_isr_buffer(struct isp_prev_device *prev)
         struct isp_buffer *buffer;
         int restart = 0;
 
-        if (prev->input == PREVIEW_INPUT_MEMORY) {
-                buffer = omap3isp_video_buffer_next(&prev->video_in);
-                if (buffer != NULL)
-                        preview_set_inaddr(prev, buffer->dma);
-                pipe->state |= ISP_PIPELINE_IDLE_INPUT;
-        }
-
         if (prev->output & PREVIEW_OUTPUT_MEMORY) {
                 buffer = omap3isp_video_buffer_next(&prev->video_out);
                 if (buffer != NULL) {
@@ -1496,6 +1489,13 @@ static void preview_isr_buffer(struct isp_prev_device *prev)
                 pipe->state |= ISP_PIPELINE_IDLE_OUTPUT;
         }
 
+        if (prev->input == PREVIEW_INPUT_MEMORY) {
+                buffer = omap3isp_video_buffer_next(&prev->video_in);
+                if (buffer != NULL)
+                        preview_set_inaddr(prev, buffer->dma);
+                pipe->state |= ISP_PIPELINE_IDLE_INPUT;
+        }
+
         switch (prev->state) {
         case ISP_PIPELINE_STREAM_SINGLESHOT:
                 if (isp_pipeline_ready(pipe))
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 994dfc0813f6..2aff755ff77c 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -434,10 +434,68 @@ static void isp_video_buffer_queue(struct vb2_buffer *buf)
         }
 }
 
+/*
+ * omap3isp_video_return_buffers - Return all queued buffers to videobuf2
+ * @video: ISP video object
+ * @state: new state for the returned buffers
+ *
+ * Return all buffers queued on the video node to videobuf2 in the given state.
+ * The buffer state should be VB2_BUF_STATE_QUEUED if called due to an error
+ * when starting the stream, or VB2_BUF_STATE_ERROR otherwise.
+ *
+ * The function must be called with the video irqlock held.
+ */
+static void omap3isp_video_return_buffers(struct isp_video *video,
+                                          enum vb2_buffer_state state)
+{
+        while (!list_empty(&video->dmaqueue)) {
+                struct isp_buffer *buf;
+
+                buf = list_first_entry(&video->dmaqueue,
+                                       struct isp_buffer, irqlist);
+                list_del(&buf->irqlist);
+                vb2_buffer_done(&buf->vb.vb2_buf, state);
+        }
+}
+
+static int isp_video_start_streaming(struct vb2_queue *queue,
+                                     unsigned int count)
+{
+        struct isp_video_fh *vfh = vb2_get_drv_priv(queue);
+        struct isp_video *video = vfh->video;
+        struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
+        unsigned long flags;
+        int ret;
+
+        /* In sensor-to-memory mode, the stream can be started synchronously
+         * to the stream on command. In memory-to-memory mode, it will be
+         * started when buffers are queued on both the input and output.
+         */
+        if (pipe->input)
+                return 0;
+
+        ret = omap3isp_pipeline_set_stream(pipe,
+                                           ISP_PIPELINE_STREAM_CONTINUOUS);
+        if (ret < 0) {
+                spin_lock_irqsave(&video->irqlock, flags);
+                omap3isp_video_return_buffers(video, VB2_BUF_STATE_QUEUED);
+                spin_unlock_irqrestore(&video->irqlock, flags);
+                return ret;
+        }
+
+        spin_lock_irqsave(&video->irqlock, flags);
+        if (list_empty(&video->dmaqueue))
+                video->dmaqueue_flags |= ISP_VIDEO_DMAQUEUE_UNDERRUN;
+        spin_unlock_irqrestore(&video->irqlock, flags);
+
+        return 0;
+}
+
 static const struct vb2_ops isp_video_queue_ops = {
         .queue_setup = isp_video_queue_setup,
         .buf_prepare = isp_video_buffer_prepare,
         .buf_queue = isp_video_buffer_queue,
+        .start_streaming = isp_video_start_streaming,
 };
 
 /*
@@ -459,7 +517,7 @@ static const struct vb2_ops isp_video_queue_ops = {
 struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
 {
         struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
-        enum isp_pipeline_state state;
+        enum vb2_buffer_state vb_state;
         struct isp_buffer *buf;
         unsigned long flags;
 
@@ -495,17 +553,19 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
 
         /* Report pipeline errors to userspace on the capture device side. */
         if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) {
-                state = VB2_BUF_STATE_ERROR;
+                vb_state = VB2_BUF_STATE_ERROR;
                 pipe->error = false;
         } else {
-                state = VB2_BUF_STATE_DONE;
+                vb_state = VB2_BUF_STATE_DONE;
         }
 
-        vb2_buffer_done(&buf->vb.vb2_buf, state);
+        vb2_buffer_done(&buf->vb.vb2_buf, vb_state);
 
         spin_lock_irqsave(&video->irqlock, flags);
 
         if (list_empty(&video->dmaqueue)) {
+                enum isp_pipeline_state state;
+
                 spin_unlock_irqrestore(&video->irqlock, flags);
 
                 if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -541,26 +601,16 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
  * omap3isp_video_cancel_stream - Cancel stream on a video node
  * @video: ISP video object
  *
- * Cancelling a stream mark all buffers on the video node as erroneous and makes
- * sure no new buffer can be queued.
+ * Cancelling a stream returns all buffers queued on the video node to videobuf2
+ * in the erroneous state and makes sure no new buffer can be queued.
  */
 void omap3isp_video_cancel_stream(struct isp_video *video)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&video->irqlock, flags);
-
-        while (!list_empty(&video->dmaqueue)) {
-                struct isp_buffer *buf;
-
-                buf = list_first_entry(&video->dmaqueue,
-                                       struct isp_buffer, irqlist);
-                list_del(&buf->irqlist);
-                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
-        }
-
+        omap3isp_video_return_buffers(video, VB2_BUF_STATE_ERROR);
         video->error = true;
-
         spin_unlock_irqrestore(&video->irqlock, flags);
 }
 
@@ -1087,29 +1137,10 @@ isp_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
         if (ret < 0)
                 goto err_check_format;
 
-        /* In sensor-to-memory mode, the stream can be started synchronously
-         * to the stream on command. In memory-to-memory mode, it will be
-         * started when buffers are queued on both the input and output.
-         */
-        if (pipe->input == NULL) {
-                ret = omap3isp_pipeline_set_stream(pipe,
-                                              ISP_PIPELINE_STREAM_CONTINUOUS);
-                if (ret < 0)
-                        goto err_set_stream;
-                spin_lock_irqsave(&video->irqlock, flags);
-                if (list_empty(&video->dmaqueue))
-                        video->dmaqueue_flags |= ISP_VIDEO_DMAQUEUE_UNDERRUN;
-                spin_unlock_irqrestore(&video->irqlock, flags);
-        }
-
         mutex_unlock(&video->stream_lock);
 
         return 0;
 
-err_set_stream:
-        mutex_lock(&video->queue_lock);
-        vb2_streamoff(&vfh->queue, type);
-        mutex_unlock(&video->queue_lock);
 err_check_format:
         media_entity_pipeline_stop(&video->video.entity);
 err_pipeline_start:
diff --git a/drivers/media/platform/omap3isp/omap3isp.h b/drivers/media/platform/omap3isp/omap3isp.h
index 190e259a6a2d..443e8f7673e2 100644
--- a/drivers/media/platform/omap3isp/omap3isp.h
+++ b/drivers/media/platform/omap3isp/omap3isp.h
@@ -33,9 +33,9 @@ enum isp_interface_type {
  * struct isp_parallel_cfg - Parallel interface configuration
  * @data_lane_shift: Data lane shifter
  *              0 - CAMEXT[13:0] -> CAM[13:0]
- *              1 - CAMEXT[13:2] -> CAM[11:0]
- *              2 - CAMEXT[13:4] -> CAM[9:0]
- *              3 - CAMEXT[13:6] -> CAM[7:0]
+ *              2 - CAMEXT[13:2] -> CAM[11:0]
+ *              4 - CAMEXT[13:4] -> CAM[9:0]
+ *              6 - CAMEXT[13:6] -> CAM[7:0]
  * @clk_pol: Pixel clock polarity
  *              0 - Sample on rising edge, 1 - Sample on falling edge
  * @hs_pol: Horizontal synchronization polarity
@@ -48,7 +48,7 @@ enum isp_interface_type {
  *              0 - Normal, 1 - One's complement
  */
 struct isp_parallel_cfg {
-        unsigned int data_lane_shift:2;
+        unsigned int data_lane_shift:3;
         unsigned int clk_pol:1;
         unsigned int hs_pol:1;
         unsigned int vs_pol:1;
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 485f5259acb0..552789a69c86 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1613,6 +1613,7 @@ static const struct of_device_id jpu_dt_ids[] = {
         { .compatible = "renesas,jpu-r8a7791" }, /* M2-W */
         { .compatible = "renesas,jpu-r8a7792" }, /* V2H */
         { .compatible = "renesas,jpu-r8a7793" }, /* M2-N */
+        { .compatible = "renesas,rcar-gen2-jpu" },
         { },
 };
 MODULE_DEVICE_TABLE(of, jpu_dt_ids);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 0434f02a7175..034b5c1d35a1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -212,6 +212,14 @@ static struct mfc_control controls[] = {
                 .menu_skip_mask = 0,
         },
         {
+                .id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
+                .type = V4L2_CTRL_TYPE_BUTTON,
+                .minimum = 0,
+                .maximum = 0,
+                .step = 0,
+                .default_value = 0,
+        },
+        {
                 .id = V4L2_CID_MPEG_VIDEO_VBV_SIZE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
                 .minimum = 0,
@@ -1423,6 +1431,10 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
         case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:
                 ctx->force_frame_type = ctrl->val;
                 break;
+        case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
+                ctx->force_frame_type =
+                        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME;
+                break;
         case V4L2_CID_MPEG_VIDEO_VBV_SIZE:
                 p->vbv_size = ctrl->val;
                 break;
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index b7fd695b9ed5..dc75a80794fb 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -143,6 +143,7 @@
 #define RCAR_VIN_BT656                  (1 << 3)
 
 enum chip_id {
+        RCAR_GEN3,
         RCAR_GEN2,
         RCAR_H1,
         RCAR_M1,
@@ -1818,6 +1819,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
 
 #ifdef CONFIG_OF
 static const struct of_device_id rcar_vin_of_table[] = {
+        { .compatible = "renesas,vin-r8a7795", .data = (void *)RCAR_GEN3 },
         { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 },
         { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 },
         { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 },
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 90c87f2b4ec0..b9f369c0fb94 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -213,8 +213,7 @@ static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
                         unsigned int *count, unsigned int *num_planes,
                         unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct soc_camera_device *icd = container_of(vq,
-                        struct soc_camera_device, vb2_vidq);
+        struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
 
@@ -361,8 +360,7 @@ static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
 static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
 {
         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-        struct soc_camera_device *icd = container_of(vb->vb2_queue,
-                        struct soc_camera_device, vb2_vidq);
+        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
         struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
@@ -413,8 +411,7 @@ error:
 static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
 {
         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-        struct soc_camera_device *icd = container_of(vb->vb2_queue,
-                        struct soc_camera_device, vb2_vidq);
+        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
@@ -444,8 +441,7 @@ static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
 static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
 {
         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-        struct soc_camera_device *icd = container_of(vb->vb2_queue,
-                        struct soc_camera_device, vb2_vidq);
+        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
 
@@ -460,7 +456,7 @@ static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
 
 static void sh_mobile_ceu_stop_streaming(struct vb2_queue *q)
 {
-        struct soc_camera_device *icd = container_of(q, struct soc_camera_device, vb2_vidq);
+        struct soc_camera_device *icd = soc_camera_from_vb2q(q);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
         struct list_head *buf_head, *tmp;
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
index 69d7fe4471c2..2c0015b1264d 100644
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
@@ -118,7 +118,7 @@ int c8sectpfe_frontend_attach(struct dvb_frontend **fe,
                 struct channel_info *tsin, int chan_num)
 {
         struct tda18212_config *tda18212;
-        struct stv6110x_devctl *fe2;
+        const struct stv6110x_devctl *fe2;
         struct i2c_client *client;
         struct i2c_board_info tda18212_info = {
                 .type = "tda18212",
diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platform/ti-vpe/Makefile
index be680f839e77..e236059a60ad 100644
--- a/drivers/media/platform/ti-vpe/Makefile
+++ b/drivers/media/platform/ti-vpe/Makefile
@@ -3,3 +3,7 @@ obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe.o
 ti-vpe-y := vpe.o sc.o csc.o vpdma.o
 
 ccflags-$(CONFIG_VIDEO_TI_VPE_DEBUG) += -DDEBUG
+
+obj-$(CONFIG_VIDEO_TI_CAL) += ti-cal.o
+
+ti-cal-y := cal.o
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
new file mode 100644
index 000000000000..35fa1071c5b2
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -0,0 +1,1971 @@
+/*
+ * TI CAL camera interface driver
+ *
+ * Copyright (c) 2015 Texas Instruments Inc.
+ * Benoit Parrot, <bparrot@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation
+ */
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+
+#include <media/v4l2-of.h>
+#include <media/v4l2-async.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-common.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
+#include "cal_regs.h"
+
+#define CAL_MODULE_NAME "cal"
+
+#define MAX_WIDTH 1920
+#define MAX_HEIGHT 1200
+
+#define CAL_VERSION "0.1.0"
+
+MODULE_DESCRIPTION("TI CAL driver");
+MODULE_AUTHOR("Benoit Parrot, <bparrot@ti.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION(CAL_VERSION);
+
+static unsigned video_nr = -1;
+module_param(video_nr, uint, 0644);
+MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
+
+static unsigned debug;
+module_param(debug, uint, 0644);
+MODULE_PARM_DESC(debug, "activates debug info");
+
+/* timeperframe: min/max and default */
+static const struct v4l2_fract
+        tpf_default = {.numerator = 1001,       .denominator = 30000};
+
+#define cal_dbg(level, caldev, fmt, arg...)     \
+                v4l2_dbg(level, debug, &caldev->v4l2_dev, fmt, ##arg)
+#define cal_info(caldev, fmt, arg...)   \
+                v4l2_info(&caldev->v4l2_dev, fmt, ##arg)
+#define cal_err(caldev, fmt, arg...)    \
+                v4l2_err(&caldev->v4l2_dev, fmt, ##arg)
+
+#define ctx_dbg(level, ctx, fmt, arg...)        \
+                v4l2_dbg(level, debug, &ctx->v4l2_dev, fmt, ##arg)
+#define ctx_info(ctx, fmt, arg...)      \
+                v4l2_info(&ctx->v4l2_dev, fmt, ##arg)
+#define ctx_err(ctx, fmt, arg...)       \
+                v4l2_err(&ctx->v4l2_dev, fmt, ##arg)
+
+#define CAL_NUM_INPUT 1
+#define CAL_NUM_CONTEXT 2
+
+#define bytes_per_line(pixel, bpp) (ALIGN(pixel * bpp, 16))
+
+#define reg_read(dev, offset) ioread32(dev->base + offset)
+#define reg_write(dev, offset, val) iowrite32(val, dev->base + offset)
+
+#define reg_read_field(dev, offset, mask) get_field(reg_read(dev, offset), \
+                                                    mask)
+#define reg_write_field(dev, offset, field, mask) { \
+        u32 val = reg_read(dev, offset); \
+        set_field(&val, field, mask); \
+        reg_write(dev, offset, val); }
+
+/* ------------------------------------------------------------------
+ *      Basic structures
+ * ------------------------------------------------------------------
+ */
+
+struct cal_fmt {
+        u32     fourcc;
+        u32     code;
+        u8      depth;
+};
+
+static struct cal_fmt cal_formats[] = {
+        {
+                .fourcc         = V4L2_PIX_FMT_YUYV,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_UYVY,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_YVYU,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_VYUY,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_LE,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_BE,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB24, /* rgb */
+                .code           = MEDIA_BUS_FMT_RGB888_2X12_LE,
+                .depth          = 24,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_BGR24, /* bgr */
+                .code           = MEDIA_BUS_FMT_RGB888_2X12_BE,
+                .depth          = 24,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_RGB32, /* argb */
+                .code           = MEDIA_BUS_FMT_ARGB8888_1X32,
+                .depth          = 32,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SBGGR8,
+                .code           = MEDIA_BUS_FMT_SBGGR8_1X8,
+                .depth          = 8,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGBRG8,
+                .code           = MEDIA_BUS_FMT_SGBRG8_1X8,
+                .depth          = 8,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGRBG8,
+                .code           = MEDIA_BUS_FMT_SGRBG8_1X8,
+                .depth          = 8,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SRGGB8,
+                .code           = MEDIA_BUS_FMT_SRGGB8_1X8,
+                .depth          = 8,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SBGGR10,
+                .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGBRG10,
+                .code           = MEDIA_BUS_FMT_SGBRG10_1X10,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGRBG10,
+                .code           = MEDIA_BUS_FMT_SGRBG10_1X10,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SRGGB10,
+                .code           = MEDIA_BUS_FMT_SRGGB10_1X10,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SBGGR12,
+                .code           = MEDIA_BUS_FMT_SBGGR12_1X12,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGBRG12,
+                .code           = MEDIA_BUS_FMT_SGBRG12_1X12,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SGRBG12,
+                .code           = MEDIA_BUS_FMT_SGRBG12_1X12,
+                .depth          = 16,
+        }, {
+                .fourcc         = V4L2_PIX_FMT_SRGGB12,
+                .code           = MEDIA_BUS_FMT_SRGGB12_1X12,
+                .depth          = 16,
+        },
+};
+
+/*  Print Four-character-code (FOURCC) */
+static char *fourcc_to_str(u32 fmt)
+{
+        static char code[5];
+
+        code[0] = (unsigned char)(fmt & 0xff);
+        code[1] = (unsigned char)((fmt >> 8) & 0xff);
+        code[2] = (unsigned char)((fmt >> 16) & 0xff);
+        code[3] = (unsigned char)((fmt >> 24) & 0xff);
+        code[4] = '\0';
+
+        return code;
+}
+
+/* buffer for one video frame */
+struct cal_buffer {
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer  vb;
+        struct list_head        list;
+        const struct cal_fmt    *fmt;
+};
+
+struct cal_dmaqueue {
+        struct list_head        active;
+
+        /* Counters to control fps rate */
+        int                     frame;
+        int                     ini_jiffies;
+};
+
+struct cm_data {
+        void __iomem            *base;
+        struct resource         *res;
+
+        unsigned int            camerrx_control;
+
+        struct platform_device *pdev;
+};
+
+struct cc_data {
+        void __iomem            *base;
+        struct resource         *res;
+
+        struct platform_device *pdev;
+};
+
+/*
+ * there is one cal_dev structure in the driver, it is shared by
+ * all instances.
+ */
+struct cal_dev {
+        int                     irq;
+        void __iomem            *base;
+        struct resource         *res;
+        struct platform_device  *pdev;
+        struct v4l2_device      v4l2_dev;
+
+        /* Control Module handle */
+        struct cm_data          *cm;
+        /* Camera Core Module handle */
+        struct cc_data          *cc[CAL_NUM_CSI2_PORTS];
+
+        struct cal_ctx          *ctx[CAL_NUM_CONTEXT];
+};
+
+/*
+ * There is one cal_ctx structure for each camera core context.
+ */
+struct cal_ctx {
+        struct v4l2_device      v4l2_dev;
+        struct v4l2_ctrl_handler ctrl_handler;
+        struct video_device     vdev;
+        struct v4l2_async_notifier notifier;
+        struct v4l2_subdev      *sensor;
+        struct v4l2_of_endpoint endpoint;
+
+        struct v4l2_async_subdev asd;
+        struct v4l2_async_subdev *asd_list[1];
+
+        struct v4l2_fh          fh;
+        struct cal_dev          *dev;
+        struct cc_data          *cc;
+
+        /* v4l2_ioctl mutex */
+        struct mutex            mutex;
+        /* v4l2 buffers lock */
+        spinlock_t              slock;
+
+        /* Several counters */
+        unsigned long           jiffies;
+
+        struct vb2_alloc_ctx    *alloc_ctx;
+        struct cal_dmaqueue     vidq;
+
+        /* Input Number */
+        int                     input;
+
+        /* video capture */
+        const struct cal_fmt    *fmt;
+        /* Used to store current pixel format */
+        struct v4l2_format              v_fmt;
+        /* Used to store current mbus frame format */
+        struct v4l2_mbus_framefmt       m_fmt;
+
+        /* Current subdev enumerated format */
+        struct cal_fmt          *active_fmt[ARRAY_SIZE(cal_formats)];
+        int                     num_active_fmt;
+
+        struct v4l2_fract       timeperframe;
+        unsigned int            sequence;
+        unsigned int            external_rate;
+        struct vb2_queue        vb_vidq;
+        unsigned int            seq_count;
+        unsigned int            csi2_port;
+        unsigned int            virtual_channel;
+
+        /* Pointer pointing to current v4l2_buffer */
+        struct cal_buffer       *cur_frm;
+        /* Pointer pointing to next v4l2_buffer */
+        struct cal_buffer       *next_frm;
+};
+
+static const struct cal_fmt *find_format_by_pix(struct cal_ctx *ctx,
+                                                u32 pixelformat)
+{
+        const struct cal_fmt *fmt;
+        unsigned int k;
+
+        for (k = 0; k < ctx->num_active_fmt; k++) {
+                fmt = ctx->active_fmt[k];
+                if (fmt->fourcc == pixelformat)
+                        return fmt;
+        }
+
+        return NULL;
+}
+
+static const struct cal_fmt *find_format_by_code(struct cal_ctx *ctx,
+                                                 u32 code)
+{
+        const struct cal_fmt *fmt;
+        unsigned int k;
+
+        for (k = 0; k < ctx->num_active_fmt; k++) {
+                fmt = ctx->active_fmt[k];
+                if (fmt->code == code)
+                        return fmt;
+        }
+
+        return NULL;
+}
+
+static inline struct cal_ctx *notifier_to_ctx(struct v4l2_async_notifier *n)
+{
+        return container_of(n, struct cal_ctx, notifier);
+}
+
+static inline int get_field(u32 value, u32 mask)
+{
+        return (value & mask) >> __ffs(mask);
+}
+
+static inline void set_field(u32 *valp, u32 field, u32 mask)
+{
+        u32 val = *valp;
+
+        val &= ~mask;
+        val |= (field << __ffs(mask)) & mask;
+        *valp = val;
+}
+
+/*
+ * Control Module block access
+ */
+static struct cm_data *cm_create(struct cal_dev *dev)
+{
+        struct platform_device *pdev = dev->pdev;
+        struct cm_data *cm;
+
+        cm = devm_kzalloc(&pdev->dev, sizeof(*cm), GFP_KERNEL);
+        if (!cm)
+                return ERR_PTR(-ENOMEM);
+
+        cm->res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                "camerrx_control");
+        cm->base = devm_ioremap_resource(&pdev->dev, cm->res);
+        if (IS_ERR(cm->base)) {
+                cal_err(dev, "failed to ioremap\n");
+                return ERR_CAST(cm->base);
+        }
+
+        cal_dbg(1, dev, "ioresource %s at %pa - %pa\n",
+                cm->res->name, &cm->res->start, &cm->res->end);
+
+        return cm;
+}
+
+static void camerarx_phy_enable(struct cal_ctx *ctx)
+{
+        u32 val;
+
+        if (!ctx->dev->cm->base) {
+                ctx_err(ctx, "cm not mapped\n");
+                return;
+        }
+
+        val = reg_read(ctx->dev->cm, CM_CTRL_CORE_CAMERRX_CONTROL);
+        if (ctx->csi2_port == 1) {
+                set_field(&val, 1, CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK);
+                set_field(&val, 0, CM_CAMERRX_CTRL_CSI0_CAMMODE_MASK);
+                /* enable all lanes by default */
+                set_field(&val, 0xf, CM_CAMERRX_CTRL_CSI0_LANEENABLE_MASK);
+                set_field(&val, 1, CM_CAMERRX_CTRL_CSI0_MODE_MASK);
+        } else if (ctx->csi2_port == 2) {
+                set_field(&val, 1, CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK);
+                set_field(&val, 0, CM_CAMERRX_CTRL_CSI1_CAMMODE_MASK);
+                /* enable all lanes by default */
+                set_field(&val, 0x3, CM_CAMERRX_CTRL_CSI1_LANEENABLE_MASK);
+                set_field(&val, 1, CM_CAMERRX_CTRL_CSI1_MODE_MASK);
+        }
+        reg_write(ctx->dev->cm, CM_CTRL_CORE_CAMERRX_CONTROL, val);
+}
+
+static void camerarx_phy_disable(struct cal_ctx *ctx)
+{
+        u32 val;
+
+        if (!ctx->dev->cm->base) {
+                ctx_err(ctx, "cm not mapped\n");
+                return;
+        }
+
+        val = reg_read(ctx->dev->cm, CM_CTRL_CORE_CAMERRX_CONTROL);
+        if (ctx->csi2_port == 1)
+                set_field(&val, 0x0, CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK);
+        else if (ctx->csi2_port == 2)
+                set_field(&val, 0x0, CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK);
+        reg_write(ctx->dev->cm, CM_CTRL_CORE_CAMERRX_CONTROL, val);
+}
+
+/*
+ * Camera Instance access block
+ */
+static struct cc_data *cc_create(struct cal_dev *dev, unsigned int core)
+{
+        struct platform_device *pdev = dev->pdev;
+        struct cc_data *cc;
+
+        cc = devm_kzalloc(&pdev->dev, sizeof(*cc), GFP_KERNEL);
+        if (!cc)
+                return ERR_PTR(-ENOMEM);
+
+        cc->res = platform_get_resource_byname(pdev,
+                                               IORESOURCE_MEM,
+                                               (core == 0) ?
+                                                "cal_rx_core0" :
+                                                "cal_rx_core1");
+        cc->base = devm_ioremap_resource(&pdev->dev, cc->res);
+        if (IS_ERR(cc->base)) {
+                cal_err(dev, "failed to ioremap\n");
+                return ERR_CAST(cc->base);
+        }
+
+        cal_dbg(1, dev, "ioresource %s at %pa - %pa\n",
+                cc->res->name, &cc->res->start, &cc->res->end);
+
+        return cc;
+}
+
+/*
+ * Get Revision and HW info
+ */
+static void cal_get_hwinfo(struct cal_dev *dev)
+{
+        u32 revision = 0;
+        u32 hwinfo = 0;
+
+        revision = reg_read(dev, CAL_HL_REVISION);
+        cal_dbg(3, dev, "CAL_HL_REVISION = 0x%08x (expecting 0x40000200)\n",
+                revision);
+
+        hwinfo = reg_read(dev, CAL_HL_HWINFO);
+        cal_dbg(3, dev, "CAL_HL_HWINFO = 0x%08x (expecting 0xA3C90469)\n",
+                hwinfo);
+}
+
+static inline int cal_runtime_get(struct cal_dev *dev)
+{
+        int r;
+
+        r = pm_runtime_get_sync(&dev->pdev->dev);
+
+        return r;
+}
+
+static inline void cal_runtime_put(struct cal_dev *dev)
+{
+        pm_runtime_put_sync(&dev->pdev->dev);
+}
+
+static void cal_quickdump_regs(struct cal_dev *dev)
+{
+        cal_info(dev, "CAL Registers @ 0x%pa:\n", &dev->res->start);
+        print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
+                       (__force const void *)dev->base,
+                       resource_size(dev->res), false);
+
+        if (dev->ctx[0]) {
+                cal_info(dev, "CSI2 Core 0 Registers @ %pa:\n",
+                         &dev->ctx[0]->cc->res->start);
+                print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
+                               (__force const void *)dev->ctx[0]->cc->base,
+                               resource_size(dev->ctx[0]->cc->res),
+                               false);
+        }
+
+        if (dev->ctx[1]) {
+                cal_info(dev, "CSI2 Core 1 Registers @ %pa:\n",
+                         &dev->ctx[1]->cc->res->start);
+                print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
+                               (__force const void *)dev->ctx[1]->cc->base,
+                               resource_size(dev->ctx[1]->cc->res),
+                               false);
+        }
+
+        cal_info(dev, "CAMERRX_Control Registers @ %pa:\n",
+                 &dev->cm->res->start);
+        print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
+                       (__force const void *)dev->cm->base,
+                       resource_size(dev->cm->res), false);
+}
+
+/*
+ * Enable the expected IRQ sources
+ */
+static void enable_irqs(struct cal_ctx *ctx)
+{
+        /* Enable IRQ_WDMA_END 0/1 */
+        reg_write_field(ctx->dev,
+                        CAL_HL_IRQENABLE_SET(2),
+                        CAL_HL_IRQ_ENABLE,
+                        CAL_HL_IRQ_MASK(ctx->csi2_port));
+        /* Enable IRQ_WDMA_START 0/1 */
+        reg_write_field(ctx->dev,
+                        CAL_HL_IRQENABLE_SET(3),
+                        CAL_HL_IRQ_ENABLE,
+                        CAL_HL_IRQ_MASK(ctx->csi2_port));
+        /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
+        reg_write(ctx->dev, CAL_CSI2_VC_IRQENABLE(1), 0xFF000000);
+}
+
+static void disable_irqs(struct cal_ctx *ctx)
+{
+        /* Disable IRQ_WDMA_END 0/1 */
+        reg_write_field(ctx->dev,
+                        CAL_HL_IRQENABLE_CLR(2),
+                        CAL_HL_IRQ_CLEAR,
+                        CAL_HL_IRQ_MASK(ctx->csi2_port));
+        /* Disable IRQ_WDMA_START 0/1 */
+        reg_write_field(ctx->dev,
+                        CAL_HL_IRQENABLE_CLR(3),
+                        CAL_HL_IRQ_CLEAR,
+                        CAL_HL_IRQ_MASK(ctx->csi2_port));
+        /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
+        reg_write(ctx->dev, CAL_CSI2_VC_IRQENABLE(1), 0);
+}
+
+static void csi2_init(struct cal_ctx *ctx)
+{
+        int i;
+        u32 val;
+
+        val = reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port));
+        set_field(&val, CAL_GEN_ENABLE,
+                  CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK);
+        set_field(&val, CAL_GEN_ENABLE,
+                  CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK);
+        set_field(&val, CAL_GEN_DISABLE,
+                  CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK);
+        set_field(&val, 407, CAL_CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK);
+        reg_write(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_CSI2_TIMING(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port)));
+
+        val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
+        set_field(&val, CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL,
+                  CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
+        set_field(&val, CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON,
+                  CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK);
+        reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
+        for (i = 0; i < 10; i++) {
+                if (reg_read_field(ctx->dev,
+                                   CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
+                                   CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_MASK) ==
+                    CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_ON)
+                        break;
+                usleep_range(1000, 1100);
+        }
+        ctx_dbg(3, ctx, "CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port)));
+
+        val = reg_read(ctx->dev, CAL_CTRL);
+        set_field(&val, CAL_CTRL_BURSTSIZE_BURST128, CAL_CTRL_BURSTSIZE_MASK);
+        set_field(&val, 0xF, CAL_CTRL_TAGCNT_MASK);
+        set_field(&val, CAL_CTRL_POSTED_WRITES_NONPOSTED,
+                  CAL_CTRL_POSTED_WRITES_MASK);
+        set_field(&val, 0xFF, CAL_CTRL_MFLAGL_MASK);
+        set_field(&val, 0xFF, CAL_CTRL_MFLAGH_MASK);
+        reg_write(ctx->dev, CAL_CTRL, val);
+        ctx_dbg(3, ctx, "CAL_CTRL = 0x%08x\n", reg_read(ctx->dev, CAL_CTRL));
+}
+
+static void csi2_lane_config(struct cal_ctx *ctx)
+{
+        u32 val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
+        u32 lane_mask = CAL_CSI2_COMPLEXIO_CFG_CLOCK_POSITION_MASK;
+        u32 polarity_mask = CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK;
+        struct v4l2_of_bus_mipi_csi2 *mipi_csi2 = &ctx->endpoint.bus.mipi_csi2;
+        int lane;
+
+        set_field(&val, mipi_csi2->clock_lane + 1, lane_mask);
+        set_field(&val, mipi_csi2->lane_polarities[0], polarity_mask);
+        for (lane = 0; lane < mipi_csi2->num_data_lanes; lane++) {
+                /*
+                 * Every lane are one nibble apart starting with the
+                 * clock followed by the data lanes so shift masks by 4.
+                 */
+                lane_mask <<= 4;
+                polarity_mask <<= 4;
+                set_field(&val, mipi_csi2->data_lanes[lane] + 1, lane_mask);
+                set_field(&val, mipi_csi2->lane_polarities[lane + 1],
+                          polarity_mask);
+        }
+
+        reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x\n",
+                ctx->csi2_port, val);
+}
+
+static void csi2_ppi_enable(struct cal_ctx *ctx)
+{
+        reg_write_field(ctx->dev, CAL_CSI2_PPI_CTRL(ctx->csi2_port),
+                        CAL_GEN_ENABLE, CAL_CSI2_PPI_CTRL_IF_EN_MASK);
+}
+
+static void csi2_ppi_disable(struct cal_ctx *ctx)
+{
+        reg_write_field(ctx->dev, CAL_CSI2_PPI_CTRL(ctx->csi2_port),
+                        CAL_GEN_DISABLE, CAL_CSI2_PPI_CTRL_IF_EN_MASK);
+}
+
+static void csi2_ctx_config(struct cal_ctx *ctx)
+{
+        u32 val;
+
+        val = reg_read(ctx->dev, CAL_CSI2_CTX0(ctx->csi2_port));
+        set_field(&val, ctx->csi2_port, CAL_CSI2_CTX_CPORT_MASK);
+        /*
+         * DT type: MIPI CSI-2 Specs
+         *   0x1: All - DT filter is disabled
+         *  0x24: RGB888 1 pixel  = 3 bytes
+         *  0x2B: RAW10  4 pixels = 5 bytes
+         *  0x2A: RAW8   1 pixel  = 1 byte
+         *  0x1E: YUV422 2 pixels = 4 bytes
+         */
+        set_field(&val, 0x1, CAL_CSI2_CTX_DT_MASK);
+        /* Virtual Channel from the CSI2 sensor usually 0! */
+        set_field(&val, ctx->virtual_channel, CAL_CSI2_CTX_VC_MASK);
+        /* NUM_LINES_PER_FRAME => 0 means auto detect */
+        set_field(&val, 0, CAL_CSI2_CTX_LINES_MASK);
+        set_field(&val, CAL_CSI2_CTX_ATT_PIX, CAL_CSI2_CTX_ATT_MASK);
+        set_field(&val, CAL_CSI2_CTX_PACK_MODE_LINE,
+                  CAL_CSI2_CTX_PACK_MODE_MASK);
+        reg_write(ctx->dev, CAL_CSI2_CTX0(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_CSI2_CTX0(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_CSI2_CTX0(ctx->csi2_port)));
+}
+
+static void pix_proc_config(struct cal_ctx *ctx)
+{
+        u32 val;
+
+        val = reg_read(ctx->dev, CAL_PIX_PROC(ctx->csi2_port));
+        set_field(&val, CAL_PIX_PROC_EXTRACT_B8, CAL_PIX_PROC_EXTRACT_MASK);
+        set_field(&val, CAL_PIX_PROC_DPCMD_BYPASS, CAL_PIX_PROC_DPCMD_MASK);
+        set_field(&val, CAL_PIX_PROC_DPCME_BYPASS, CAL_PIX_PROC_DPCME_MASK);
+        set_field(&val, CAL_PIX_PROC_PACK_B8, CAL_PIX_PROC_PACK_MASK);
+        set_field(&val, ctx->csi2_port, CAL_PIX_PROC_CPORT_MASK);
+        set_field(&val, CAL_GEN_ENABLE, CAL_PIX_PROC_EN_MASK);
+        reg_write(ctx->dev, CAL_PIX_PROC(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_PIX_PROC(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_PIX_PROC(ctx->csi2_port)));
+}
+
+static void cal_wr_dma_config(struct cal_ctx *ctx,
+                              unsigned int width)
+{
+        u32 val;
+
+        val = reg_read(ctx->dev, CAL_WR_DMA_CTRL(ctx->csi2_port));
+        set_field(&val, ctx->csi2_port, CAL_WR_DMA_CTRL_CPORT_MASK);
+        set_field(&val, CAL_WR_DMA_CTRL_DTAG_PIX_DAT,
+                  CAL_WR_DMA_CTRL_DTAG_MASK);
+        set_field(&val, CAL_WR_DMA_CTRL_MODE_CONST,
+                  CAL_WR_DMA_CTRL_MODE_MASK);
+        set_field(&val, CAL_WR_DMA_CTRL_PATTERN_LINEAR,
+                  CAL_WR_DMA_CTRL_PATTERN_MASK);
+        set_field(&val, CAL_GEN_ENABLE, CAL_WR_DMA_CTRL_STALL_RD_MASK);
+        reg_write(ctx->dev, CAL_WR_DMA_CTRL(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_WR_DMA_CTRL(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_WR_DMA_CTRL(ctx->csi2_port)));
+
+        /*
+         * width/16 not sure but giving it a whirl.
+         * zero does not work right
+         */
+        reg_write_field(ctx->dev,
+                        CAL_WR_DMA_OFST(ctx->csi2_port),
+                        (width / 16),
+                        CAL_WR_DMA_OFST_MASK);
+        ctx_dbg(3, ctx, "CAL_WR_DMA_OFST(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_WR_DMA_OFST(ctx->csi2_port)));
+
+        val = reg_read(ctx->dev, CAL_WR_DMA_XSIZE(ctx->csi2_port));
+        /* 64 bit word means no skipping */
+        set_field(&val, 0, CAL_WR_DMA_XSIZE_XSKIP_MASK);
+        /*
+         * (width*8)/64 this should be size of an entire line
+         * in 64bit word but 0 means all data until the end
+         * is detected automagically
+         */
+        set_field(&val, (width / 8), CAL_WR_DMA_XSIZE_MASK);
+        reg_write(ctx->dev, CAL_WR_DMA_XSIZE(ctx->csi2_port), val);
+        ctx_dbg(3, ctx, "CAL_WR_DMA_XSIZE(%d) = 0x%08x\n", ctx->csi2_port,
+                reg_read(ctx->dev, CAL_WR_DMA_XSIZE(ctx->csi2_port)));
+}
+
+static void cal_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr)
+{
+        reg_write(ctx->dev, CAL_WR_DMA_ADDR(ctx->csi2_port), dmaaddr);
+}
+
+/*
+ * TCLK values are OK at their reset values
+ */
+#define TCLK_TERM       0
+#define TCLK_MISS       1
+#define TCLK_SETTLE     14
+#define THS_SETTLE      15
+
+static void csi2_phy_config(struct cal_ctx *ctx)
+{
+        unsigned int reg0, reg1;
+        unsigned int ths_term, ths_settle;
+        unsigned int ddrclkperiod_us;
+
+        /*
+         * THS_TERM: Programmed value = floor(20 ns/DDRClk period) - 2.
+         */
+        ddrclkperiod_us = ctx->external_rate / 2000000;
+        ddrclkperiod_us = 1000000 / ddrclkperiod_us;
+        ctx_dbg(1, ctx, "ddrclkperiod_us: %d\n", ddrclkperiod_us);
+
+        ths_term = 20000 / ddrclkperiod_us;
+        ths_term = (ths_term >= 2) ? ths_term - 2 : ths_term;
+        ctx_dbg(1, ctx, "ths_term: %d (0x%02x)\n", ths_term, ths_term);
+
+        /*
+         * THS_SETTLE: Programmed value = floor(176.3 ns/CtrlClk period) - 1.
+         *      Since CtrlClk is fixed at 96Mhz then we get
+         *      ths_settle = floor(176.3 / 10.416) - 1 = 15
+         * If we ever switch to a dynamic clock then this code might be useful
+         *
+         * unsigned int ctrlclkperiod_us;
+         * ctrlclkperiod_us = 96000000 / 1000000;
+         * ctrlclkperiod_us = 1000000 / ctrlclkperiod_us;
+         * ctx_dbg(1, ctx, "ctrlclkperiod_us: %d\n", ctrlclkperiod_us);
+
+         * ths_settle = 176300  / ctrlclkperiod_us;
+         * ths_settle = (ths_settle > 1) ? ths_settle - 1 : ths_settle;
+         */
+
+        ths_settle = THS_SETTLE;
+        ctx_dbg(1, ctx, "ths_settle: %d (0x%02x)\n", ths_settle, ths_settle);
+
+        reg0 = reg_read(ctx->cc, CAL_CSI2_PHY_REG0);
+        set_field(&reg0, CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_DISABLE,
+                  CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK);
+        set_field(&reg0, ths_term, CAL_CSI2_PHY_REG0_THS_TERM_MASK);
+        set_field(&reg0, ths_settle, CAL_CSI2_PHY_REG0_THS_SETTLE_MASK);
+
+        ctx_dbg(1, ctx, "CSI2_%d_REG0 = 0x%08x\n", (ctx->csi2_port - 1), reg0);
+        reg_write(ctx->cc, CAL_CSI2_PHY_REG0, reg0);
+
+        reg1 = reg_read(ctx->cc, CAL_CSI2_PHY_REG1);
+        set_field(&reg1, TCLK_TERM, CAL_CSI2_PHY_REG1_TCLK_TERM_MASK);
+        set_field(&reg1, 0xb8, CAL_CSI2_PHY_REG1_DPHY_HS_SYNC_PATTERN_MASK);
+        set_field(&reg1, TCLK_MISS, CAL_CSI2_PHY_REG1_CTRLCLK_DIV_FACTOR_MASK);
+        set_field(&reg1, TCLK_SETTLE, CAL_CSI2_PHY_REG1_TCLK_SETTLE_MASK);
+
+        ctx_dbg(1, ctx, "CSI2_%d_REG1 = 0x%08x\n", (ctx->csi2_port - 1), reg1);
+        reg_write(ctx->cc, CAL_CSI2_PHY_REG1, reg1);
+}
+
+static int cal_get_external_info(struct cal_ctx *ctx)
+{
+        struct v4l2_ctrl *ctrl;
+
+        ctrl = v4l2_ctrl_find(ctx->sensor->ctrl_handler, V4L2_CID_PIXEL_RATE);
+        if (!ctrl) {
+                ctx_err(ctx, "no pixel rate control in subdev: %s\n",
+                        ctx->sensor->name);
+                return -EPIPE;
+        }
+
+        ctx->external_rate = v4l2_ctrl_g_ctrl_int64(ctrl);
+        ctx_dbg(3, ctx, "sensor Pixel Rate: %d\n", ctx->external_rate);
+
+        return 0;
+}
+
+static inline void cal_schedule_next_buffer(struct cal_ctx *ctx)
+{
+        struct cal_dmaqueue *dma_q = &ctx->vidq;
+        struct cal_buffer *buf;
+        unsigned long addr;
+
+        buf = list_entry(dma_q->active.next, struct cal_buffer, list);
+        ctx->next_frm = buf;
+        list_del(&buf->list);
+
+        addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
+        cal_wr_dma_addr(ctx, addr);
+}
+
+static inline void cal_process_buffer_complete(struct cal_ctx *ctx)
+{
+        ctx->cur_frm->vb.vb2_buf.timestamp = ktime_get_ns();
+        ctx->cur_frm->vb.field = ctx->m_fmt.field;
+        ctx->cur_frm->vb.sequence = ctx->sequence++;
+
+        vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
+        ctx->cur_frm = ctx->next_frm;
+}
+
+#define isvcirqset(irq, vc, ff) (irq & \
+        (CAL_CSI2_VC_IRQENABLE_ ##ff ##_IRQ_##vc ##_MASK))
+
+#define isportirqset(irq, port) (irq & CAL_HL_IRQ_MASK(port))
+
+static irqreturn_t cal_irq(int irq_cal, void *data)
+{
+        struct cal_dev *dev = (struct cal_dev *)data;
+        struct cal_ctx *ctx;
+        struct cal_dmaqueue *dma_q;
+        u32 irqst2, irqst3;
+
+        /* Check which DMA just finished */
+        irqst2 = reg_read(dev, CAL_HL_IRQSTATUS(2));
+        if (irqst2) {
+                /* Clear Interrupt status */
+                reg_write(dev, CAL_HL_IRQSTATUS(2), irqst2);
+
+                /* Need to check both port */
+                if (isportirqset(irqst2, 1)) {
+                        ctx = dev->ctx[0];
+
+                        if (ctx->cur_frm != ctx->next_frm)
+                                cal_process_buffer_complete(ctx);
+                }
+
+                if (isportirqset(irqst2, 2)) {
+                        ctx = dev->ctx[1];
+
+                        if (ctx->cur_frm != ctx->next_frm)
+                                cal_process_buffer_complete(ctx);
+                }
+        }
+
+        /* Check which DMA just started */
+        irqst3 = reg_read(dev, CAL_HL_IRQSTATUS(3));
+        if (irqst3) {
+                /* Clear Interrupt status */
+                reg_write(dev, CAL_HL_IRQSTATUS(3), irqst3);
+
+                /* Need to check both port */
+                if (isportirqset(irqst3, 1)) {
+                        ctx = dev->ctx[0];
+                        dma_q = &ctx->vidq;
+
+                        spin_lock(&ctx->slock);
+                        if (!list_empty(&dma_q->active) &&
+                            ctx->cur_frm == ctx->next_frm)
+                                cal_schedule_next_buffer(ctx);
+                        spin_unlock(&ctx->slock);
+                }
+
+                if (isportirqset(irqst3, 2)) {
+                        ctx = dev->ctx[1];
+                        dma_q = &ctx->vidq;
+
+                        spin_lock(&ctx->slock);
+                        if (!list_empty(&dma_q->active) &&
+                            ctx->cur_frm == ctx->next_frm)
+                                cal_schedule_next_buffer(ctx);
+                        spin_unlock(&ctx->slock);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * video ioctls
+ */
+static int cal_querycap(struct file *file, void *priv,
+                        struct v4l2_capability *cap)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+
+        strlcpy(cap->driver, CAL_MODULE_NAME, sizeof(cap->driver));
+        strlcpy(cap->card, CAL_MODULE_NAME, sizeof(cap->card));
+
+        snprintf(cap->bus_info, sizeof(cap->bus_info),
+                 "platform:%s", ctx->v4l2_dev.name);
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
+                            V4L2_CAP_READWRITE;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+        return 0;
+}
+
+static int cal_enum_fmt_vid_cap(struct file *file, void  *priv,
+                                struct v4l2_fmtdesc *f)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+        const struct cal_fmt *fmt = NULL;
+
+        if (f->index >= ctx->num_active_fmt)
+                return -EINVAL;
+
+        fmt = ctx->active_fmt[f->index];
+
+        f->pixelformat = fmt->fourcc;
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        return 0;
+}
+
+static int __subdev_get_format(struct cal_ctx *ctx,
+                               struct v4l2_mbus_framefmt *fmt)
+{
+        struct v4l2_subdev_format sd_fmt;
+        struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format;
+        int ret;
+
+        if (!ctx->sensor)
+                return -EINVAL;
+
+        sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        sd_fmt.pad = 0;
+
+        ret = v4l2_subdev_call(ctx->sensor, pad, get_fmt, NULL, &sd_fmt);
+        if (ret)
+                return ret;
+
+        *fmt = *mbus_fmt;
+
+        ctx_dbg(1, ctx, "%s %dx%d code:%04X\n", __func__,
+                fmt->width, fmt->height, fmt->code);
+
+        return 0;
+}
+
+static int __subdev_set_format(struct cal_ctx *ctx,
+                               struct v4l2_mbus_framefmt *fmt)
+{
+        struct v4l2_subdev_format sd_fmt;
+        struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format;
+        int ret;
+
+        if (!ctx->sensor)
+                return -EINVAL;
+
+        sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        sd_fmt.pad = 0;
+        *mbus_fmt = *fmt;
+
+        ret = v4l2_subdev_call(ctx->sensor, pad, set_fmt, NULL, &sd_fmt);
+        if (ret)
+                return ret;
+
+        ctx_dbg(1, ctx, "%s %dx%d code:%04X\n", __func__,
+                fmt->width, fmt->height, fmt->code);
+
+        return 0;
+}
+
+static int cal_calc_format_size(struct cal_ctx *ctx,
+                                const struct cal_fmt *fmt,
+                                struct v4l2_format *f)
+{
+        if (!fmt) {
+                ctx_dbg(3, ctx, "No cal_fmt provided!\n");
+                return -EINVAL;
+        }
+
+        v4l_bound_align_image(&f->fmt.pix.width, 48, MAX_WIDTH, 2,
+                              &f->fmt.pix.height, 32, MAX_HEIGHT, 0, 0);
+        f->fmt.pix.bytesperline = bytes_per_line(f->fmt.pix.width,
+                                                 fmt->depth >> 3);
+        f->fmt.pix.sizeimage = f->fmt.pix.height *
+                               f->fmt.pix.bytesperline;
+
+        ctx_dbg(3, ctx, "%s: fourcc: %s size: %dx%d bpl:%d img_size:%d\n",
+                __func__, fourcc_to_str(f->fmt.pix.pixelformat),
+                f->fmt.pix.width, f->fmt.pix.height,
+                f->fmt.pix.bytesperline, f->fmt.pix.sizeimage);
+
+        return 0;
+}
+
+static int cal_g_fmt_vid_cap(struct file *file, void *priv,
+                             struct v4l2_format *f)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+
+        *f = ctx->v_fmt;
+
+        return 0;
+}
+
+static int cal_try_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+        const struct cal_fmt *fmt;
+        struct v4l2_subdev_frame_size_enum fse;
+        int ret, found;
+
+        fmt = find_format_by_pix(ctx, f->fmt.pix.pixelformat);
+        if (!fmt) {
+                ctx_dbg(3, ctx, "Fourcc format (0x%08x) not found.\n",
+                        f->fmt.pix.pixelformat);
+
+                /* Just get the first one enumerated */
+                fmt = ctx->active_fmt[0];
+                f->fmt.pix.pixelformat = fmt->fourcc;
+        }
+
+        f->fmt.pix.field = ctx->v_fmt.fmt.pix.field;
+
+        /* check for/find a valid width/height */
+        ret = 0;
+        found = false;
+        fse.pad = 0;
+        fse.code = fmt->code;
+        fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        for (fse.index = 0; ; fse.index++) {
+                ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size,
+                                       NULL, &fse);
+                if (ret)
+                        break;
+
+                if ((f->fmt.pix.width == fse.max_width) &&
+                    (f->fmt.pix.height == fse.max_height)) {
+                        found = true;
+                        break;
+                } else if ((f->fmt.pix.width >= fse.min_width) &&
+                         (f->fmt.pix.width <= fse.max_width) &&
+                         (f->fmt.pix.height >= fse.min_height) &&
+                         (f->fmt.pix.height <= fse.max_height)) {
+                        found = true;
+                        break;
+                }
+        }
+
+        if (!found) {
+                /* use existing values as default */
+                f->fmt.pix.width = ctx->v_fmt.fmt.pix.width;
+                f->fmt.pix.height =  ctx->v_fmt.fmt.pix.height;
+        }
+
+        /*
+         * Use current colorspace for now, it will get
+         * updated properly during s_fmt
+         */
+        f->fmt.pix.colorspace = ctx->v_fmt.fmt.pix.colorspace;
+        return cal_calc_format_size(ctx, fmt, f);
+}
+
+static int cal_s_fmt_vid_cap(struct file *file, void *priv,
+                             struct v4l2_format *f)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+        struct vb2_queue *q = &ctx->vb_vidq;
+        const struct cal_fmt *fmt;
+        struct v4l2_mbus_framefmt mbus_fmt;
+        int ret;
+
+        if (vb2_is_busy(q)) {
+                ctx_dbg(3, ctx, "%s device busy\n", __func__);
+                return -EBUSY;
+        }
+
+        ret = cal_try_fmt_vid_cap(file, priv, f);
+        if (ret < 0)
+                return ret;
+
+        fmt = find_format_by_pix(ctx, f->fmt.pix.pixelformat);
+
+        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, fmt->code);
+
+        ret = __subdev_set_format(ctx, &mbus_fmt);
+        if (ret)
+                return ret;
+
+        /* Just double check nothing has gone wrong */
+        if (mbus_fmt.code != fmt->code) {
+                ctx_dbg(3, ctx,
+                        "%s subdev changed format on us, this should not happen\n",
+                        __func__);
+                return -EINVAL;
+        }
+
+        v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);
+        ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        ctx->v_fmt.fmt.pix.pixelformat  = fmt->fourcc;
+        cal_calc_format_size(ctx, fmt, &ctx->v_fmt);
+        ctx->fmt = fmt;
+        ctx->m_fmt = mbus_fmt;
+        *f = ctx->v_fmt;
+
+        return 0;
+}
+
+static int cal_enum_framesizes(struct file *file, void *fh,
+                               struct v4l2_frmsizeenum *fsize)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+        const struct cal_fmt *fmt;
+        struct v4l2_subdev_frame_size_enum fse;
+        int ret;
+
+        /* check for valid format */
+        fmt = find_format_by_pix(ctx, fsize->pixel_format);
+        if (!fmt) {
+                ctx_dbg(3, ctx, "Invalid pixel code: %x\n",
+                        fsize->pixel_format);
+                return -EINVAL;
+        }
+
+        fse.index = fsize->index;
+        fse.pad = 0;
+        fse.code = fmt->code;
+
+        ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size, NULL, &fse);
+        if (ret)
+                return -EINVAL;
+
+        ctx_dbg(1, ctx, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
+                __func__, fse.index, fse.code, fse.min_width, fse.max_width,
+                fse.min_height, fse.max_height);
+
+        fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+        fsize->discrete.width = fse.max_width;
+        fsize->discrete.height = fse.max_height;
+
+        return 0;
+}
+
+static int cal_enum_input(struct file *file, void *priv,
+                          struct v4l2_input *inp)
+{
+        if (inp->index >= CAL_NUM_INPUT)
+                return -EINVAL;
+
+        inp->type = V4L2_INPUT_TYPE_CAMERA;
+        sprintf(inp->name, "Camera %u", inp->index);
+        return 0;
+}
+
+static int cal_g_input(struct file *file, void *priv, unsigned int *i)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+
+        *i = ctx->input;
+        return 0;
+}
+
+static int cal_s_input(struct file *file, void *priv, unsigned int i)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+
+        if (i >= CAL_NUM_INPUT)
+                return -EINVAL;
+
+        ctx->input = i;
+        return 0;
+}
+
+/* timeperframe is arbitrary and continuous */
+static int cal_enum_frameintervals(struct file *file, void *priv,
+                                   struct v4l2_frmivalenum *fival)
+{
+        struct cal_ctx *ctx = video_drvdata(file);
+        const struct cal_fmt *fmt;
+        struct v4l2_subdev_frame_size_enum fse;
+        int ret;
+
+        if (fival->index)
+                return -EINVAL;
+
+        fmt = find_format_by_pix(ctx, fival->pixel_format);
+        if (!fmt)
+                return -EINVAL;
+
+        /* check for valid width/height */
+        ret = 0;
+        fse.pad = 0;
+        fse.code = fmt->code;
+        fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        for (fse.index = 0; ; fse.index++) {
+                ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size,
+                                       NULL, &fse);
+                if (ret)
+                        return -EINVAL;
+
+                if ((fival->width == fse.max_width) &&
+                    (fival->height == fse.max_height))
+                        break;
+                else if ((fival->width >= fse.min_width) &&
+                         (fival->width <= fse.max_width) &&
+                         (fival->height >= fse.min_height) &&
+                         (fival->height <= fse.max_height))
+                        break;
+
+                return -EINVAL;
+        }
+
+        fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
+        fival->discrete.numerator = 1;
+        fival->discrete.denominator = 30;
+
+        return 0;
+}
+
+/*
+ * Videobuf operations
+ */
+static int cal_queue_setup(struct vb2_queue *vq,
+                           unsigned int *nbuffers, unsigned int *nplanes,
+                           unsigned int sizes[], void *alloc_ctxs[])
+{
+        struct cal_ctx *ctx = vb2_get_drv_priv(vq);
+        unsigned size = ctx->v_fmt.fmt.pix.sizeimage;
+
+        if (vq->num_buffers + *nbuffers < 3)
+                *nbuffers = 3 - vq->num_buffers;
+        alloc_ctxs[0] = ctx->alloc_ctx;
+
+        if (*nplanes) {
+                if (sizes[0] < size)
+                        return -EINVAL;
+                size = sizes[0];
+        }
+
+        *nplanes = 1;
+        sizes[0] = size;
+
+        ctx_dbg(3, ctx, "nbuffers=%d, size=%d\n", *nbuffers, sizes[0]);
+
+        return 0;
+}
+
+static int cal_buffer_prepare(struct vb2_buffer *vb)
+{
+        struct cal_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        struct cal_buffer *buf = container_of(vb, struct cal_buffer,
+                                              vb.vb2_buf);
+        unsigned long size;
+
+        if (WARN_ON(!ctx->fmt))
+                return -EINVAL;
+
+        size = ctx->v_fmt.fmt.pix.sizeimage;
+        if (vb2_plane_size(vb, 0) < size) {
+                ctx_err(ctx,
+                        "data will not fit into plane (%lu < %lu)\n",
+                        vb2_plane_size(vb, 0), size);
+                return -EINVAL;
+        }
+
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
+        return 0;
+}
+
+static void cal_buffer_queue(struct vb2_buffer *vb)
+{
+        struct cal_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        struct cal_buffer *buf = container_of(vb, struct cal_buffer,
+                                              vb.vb2_buf);
+        struct cal_dmaqueue *vidq = &ctx->vidq;
+        unsigned long flags = 0;
+
+        /* recheck locking */
+        spin_lock_irqsave(&ctx->slock, flags);
+        list_add_tail(&buf->list, &vidq->active);
+        spin_unlock_irqrestore(&ctx->slock, flags);
+}
+
+static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
+{
+        struct cal_ctx *ctx = vb2_get_drv_priv(vq);
+        struct cal_dmaqueue *dma_q = &ctx->vidq;
+        struct cal_buffer *buf, *tmp;
+        unsigned long addr = 0;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&ctx->slock, flags);
+        if (list_empty(&dma_q->active)) {
+                spin_unlock_irqrestore(&ctx->slock, flags);
+                ctx_dbg(3, ctx, "buffer queue is empty\n");
+                return -EIO;
+        }
+
+        buf = list_entry(dma_q->active.next, struct cal_buffer, list);
+        ctx->cur_frm = buf;
+        ctx->next_frm = buf;
+        list_del(&buf->list);
+        spin_unlock_irqrestore(&ctx->slock, flags);
+
+        addr = vb2_dma_contig_plane_dma_addr(&ctx->cur_frm->vb.vb2_buf, 0);
+        ctx->sequence = 0;
+
+        ret = cal_get_external_info(ctx);
+        if (ret < 0)
+                goto err;
+
+        cal_runtime_get(ctx->dev);
+
+        enable_irqs(ctx);
+        camerarx_phy_enable(ctx);
+        csi2_init(ctx);
+        csi2_phy_config(ctx);
+        csi2_lane_config(ctx);
+        csi2_ctx_config(ctx);
+        pix_proc_config(ctx);
+        cal_wr_dma_config(ctx, ctx->v_fmt.fmt.pix.bytesperline);
+        cal_wr_dma_addr(ctx, addr);
+        csi2_ppi_enable(ctx);
+
+        if (ctx->sensor) {
+                if (v4l2_subdev_call(ctx->sensor, video, s_stream, 1)) {
+                        ctx_err(ctx, "stream on failed in subdev\n");
+                        cal_runtime_put(ctx->dev);
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        if (debug >= 4)
+                cal_quickdump_regs(ctx->dev);
+
+        return 0;
+
+err:
+        list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
+        }
+        return ret;
+}
+
+static void cal_stop_streaming(struct vb2_queue *vq)
+{
+        struct cal_ctx *ctx = vb2_get_drv_priv(vq);
+        struct cal_dmaqueue *dma_q = &ctx->vidq;
+        struct cal_buffer *buf, *tmp;
+        unsigned long flags;
+
+        if (ctx->sensor) {
+                if (v4l2_subdev_call(ctx->sensor, video, s_stream, 0))
+                        ctx_err(ctx, "stream off failed in subdev\n");
+        }
+
+        csi2_ppi_disable(ctx);
+        disable_irqs(ctx);
+
+        /* Release all active buffers */
+        spin_lock_irqsave(&ctx->slock, flags);
+        list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
+        }
+
+        if (ctx->cur_frm == ctx->next_frm) {
+                vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR);
+        } else {
+                vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&ctx->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
+        }
+        ctx->cur_frm = NULL;
+        ctx->next_frm = NULL;
+        spin_unlock_irqrestore(&ctx->slock, flags);
+
+        cal_runtime_put(ctx->dev);
+}
+
+static struct vb2_ops cal_video_qops = {
+        .queue_setup            = cal_queue_setup,
+        .buf_prepare            = cal_buffer_prepare,
+        .buf_queue              = cal_buffer_queue,
+        .start_streaming        = cal_start_streaming,
+        .stop_streaming         = cal_stop_streaming,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
+};
+
+static const struct v4l2_file_operations cal_fops = {
+        .owner          = THIS_MODULE,
+        .open           = v4l2_fh_open,
+        .release        = vb2_fop_release,
+        .read           = vb2_fop_read,
+        .poll           = vb2_fop_poll,
+        .unlocked_ioctl = video_ioctl2, /* V4L2 ioctl handler */
+        .mmap           = vb2_fop_mmap,
+};
+
+static const struct v4l2_ioctl_ops cal_ioctl_ops = {
+        .vidioc_querycap      = cal_querycap,
+        .vidioc_enum_fmt_vid_cap  = cal_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap     = cal_g_fmt_vid_cap,
+        .vidioc_try_fmt_vid_cap   = cal_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap     = cal_s_fmt_vid_cap,
+        .vidioc_enum_framesizes   = cal_enum_framesizes,
+        .vidioc_reqbufs       = vb2_ioctl_reqbufs,
+        .vidioc_create_bufs   = vb2_ioctl_create_bufs,
+        .vidioc_prepare_buf   = vb2_ioctl_prepare_buf,
+        .vidioc_querybuf      = vb2_ioctl_querybuf,
+        .vidioc_qbuf          = vb2_ioctl_qbuf,
+        .vidioc_dqbuf         = vb2_ioctl_dqbuf,
+        .vidioc_enum_input    = cal_enum_input,
+        .vidioc_g_input       = cal_g_input,
+        .vidioc_s_input       = cal_s_input,
+        .vidioc_enum_frameintervals = cal_enum_frameintervals,
+        .vidioc_streamon      = vb2_ioctl_streamon,
+        .vidioc_streamoff     = vb2_ioctl_streamoff,
+        .vidioc_log_status    = v4l2_ctrl_log_status,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+static struct video_device cal_videodev = {
+        .name           = CAL_MODULE_NAME,
+        .fops           = &cal_fops,
+        .ioctl_ops      = &cal_ioctl_ops,
+        .minor          = -1,
+        .release        = video_device_release_empty,
+};
+
+/* -----------------------------------------------------------------
+ *      Initialization and module stuff
+ * ------------------------------------------------------------------
+ */
+static int cal_complete_ctx(struct cal_ctx *ctx);
+
+static int cal_async_bound(struct v4l2_async_notifier *notifier,
+                           struct v4l2_subdev *subdev,
+                           struct v4l2_async_subdev *asd)
+{
+        struct cal_ctx *ctx = notifier_to_ctx(notifier);
+        struct v4l2_subdev_mbus_code_enum mbus_code;
+        int ret = 0;
+        int i, j, k;
+
+        if (ctx->sensor) {
+                ctx_info(ctx, "Rejecting subdev %s (Already set!!)",
+                         subdev->name);
+                return 0;
+        }
+
+        ctx->sensor = subdev;
+        ctx_dbg(1, ctx, "Using sensor %s for capture\n", subdev->name);
+
+        /* Enumerate sub device formats and enable all matching local formats */
+        ctx->num_active_fmt = 0;
+        for (j = 0, i = 0; ret != -EINVAL; ++j) {
+                struct cal_fmt *fmt;
+
+                memset(&mbus_code, 0, sizeof(mbus_code));
+                mbus_code.index = j;
+                ret = v4l2_subdev_call(subdev, pad, enum_mbus_code,
+                                       NULL, &mbus_code);
+                if (ret)
+                        continue;
+
+                ctx_dbg(2, ctx,
+                        "subdev %s: code: %04x idx: %d\n",
+                        subdev->name, mbus_code.code, j);
+
+                for (k = 0; k < ARRAY_SIZE(cal_formats); k++) {
+                        fmt = &cal_formats[k];
+
+                        if (mbus_code.code == fmt->code) {
+                                ctx->active_fmt[i] = fmt;
+                                ctx_dbg(2, ctx,
+                                        "matched fourcc: %s: code: %04x idx: %d\n",
+                                        fourcc_to_str(fmt->fourcc),
+                                        fmt->code, i);
+                                ctx->num_active_fmt = ++i;
+                        }
+                }
+        }
+
+        if (i == 0) {
+                ctx_err(ctx, "No suitable format reported by subdev %s\n",
+                        subdev->name);
+                return -EINVAL;
+        }
+
+        cal_complete_ctx(ctx);
+
+        return 0;
+}
+
+static int cal_async_complete(struct v4l2_async_notifier *notifier)
+{
+        struct cal_ctx *ctx = notifier_to_ctx(notifier);
+        const struct cal_fmt *fmt;
+        struct v4l2_mbus_framefmt mbus_fmt;
+        int ret;
+
+        ret = __subdev_get_format(ctx, &mbus_fmt);
+        if (ret)
+                return ret;
+
+        fmt = find_format_by_code(ctx, mbus_fmt.code);
+        if (!fmt) {
+                ctx_dbg(3, ctx, "mbus code format (0x%08x) not found.\n",
+                        mbus_fmt.code);
+                return -EINVAL;
+        }
+
+        /* Save current subdev format */
+        v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);
+        ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        ctx->v_fmt.fmt.pix.pixelformat  = fmt->fourcc;
+        cal_calc_format_size(ctx, fmt, &ctx->v_fmt);
+        ctx->fmt = fmt;
+        ctx->m_fmt = mbus_fmt;
+
+        return 0;
+}
+
+static int cal_complete_ctx(struct cal_ctx *ctx)
+{
+        struct video_device *vfd;
+        struct vb2_queue *q;
+        int ret;
+
+        ctx->timeperframe = tpf_default;
+        ctx->external_rate = 192000000;
+
+        /* initialize locks */
+        spin_lock_init(&ctx->slock);
+        mutex_init(&ctx->mutex);
+
+        /* initialize queue */
+        q = &ctx->vb_vidq;
+        q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
+        q->drv_priv = ctx;
+        q->buf_struct_size = sizeof(struct cal_buffer);
+        q->ops = &cal_video_qops;
+        q->mem_ops = &vb2_dma_contig_memops;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->lock = &ctx->mutex;
+        q->min_buffers_needed = 3;
+
+        ret = vb2_queue_init(q);
+        if (ret)
+                return ret;
+
+        /* init video dma queues */
+        INIT_LIST_HEAD(&ctx->vidq.active);
+
+        vfd = &ctx->vdev;
+        *vfd = cal_videodev;
+        vfd->v4l2_dev = &ctx->v4l2_dev;
+        vfd->queue = q;
+
+        /*
+         * Provide a mutex to v4l2 core. It will be used to protect
+         * all fops and v4l2 ioctls.
+         */
+        vfd->lock = &ctx->mutex;
+        video_set_drvdata(vfd, ctx);
+
+        ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr);
+        if (ret < 0)
+                return ret;
+
+        v4l2_info(&ctx->v4l2_dev, "V4L2 device registered as %s\n",
+                  video_device_node_name(vfd));
+
+        ctx->alloc_ctx = vb2_dma_contig_init_ctx(vfd->v4l2_dev->dev);
+        if (IS_ERR(ctx->alloc_ctx)) {
+                ctx_err(ctx, "Failed to alloc vb2 context\n");
+                ret = PTR_ERR(ctx->alloc_ctx);
+                goto vdev_unreg;
+        }
+
+        return 0;
+
+vdev_unreg:
+        video_unregister_device(vfd);
+        return ret;
+}
+
+static struct device_node *
+of_get_next_port(const struct device_node *parent,
+                 struct device_node *prev)
+{
+        struct device_node *port = NULL;
+
+        if (!parent)
+                return NULL;
+
+        if (!prev) {
+                struct device_node *ports;
+                /*
+                 * It's the first call, we have to find a port subnode
+                 * within this node or within an optional 'ports' node.
+                 */
+                ports = of_get_child_by_name(parent, "ports");
+                if (ports)
+                        parent = ports;
+
+                port = of_get_child_by_name(parent, "port");
+
+                /* release the 'ports' node */
+                of_node_put(ports);
+        } else {
+                struct device_node *ports;
+
+                ports = of_get_parent(prev);
+                if (!ports)
+                        return NULL;
+
+                do {
+                        port = of_get_next_child(ports, prev);
+                        if (!port) {
+                                of_node_put(ports);
+                                return NULL;
+                        }
+                        prev = port;
+                } while (of_node_cmp(port->name, "port") != 0);
+        }
+
+        return port;
+}
+
+static struct device_node *
+of_get_next_endpoint(const struct device_node *parent,
+                     struct device_node *prev)
+{
+        struct device_node *ep = NULL;
+
+        if (!parent)
+                return NULL;
+
+        do {
+                ep = of_get_next_child(parent, prev);
+                if (!ep)
+                        return NULL;
+                prev = ep;
+        } while (of_node_cmp(ep->name, "endpoint") != 0);
+
+        return ep;
+}
+
+static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
+{
+        struct platform_device *pdev = ctx->dev->pdev;
+        struct device_node *ep_node, *port, *remote_ep,
+                        *sensor_node, *parent;
+        struct v4l2_of_endpoint *endpoint;
+        struct v4l2_async_subdev *asd;
+        u32 regval = 0;
+        int ret, index, found_port = 0, lane;
+
+        parent = pdev->dev.of_node;
+
+        asd = &ctx->asd;
+        endpoint = &ctx->endpoint;
+
+        ep_node = NULL;
+        port = NULL;
+        remote_ep = NULL;
+        sensor_node = NULL;
+        ret = -EINVAL;
+
+        ctx_dbg(3, ctx, "Scanning Port node for csi2 port: %d\n", inst);
+        for (index = 0; index < CAL_NUM_CSI2_PORTS; index++) {
+                port = of_get_next_port(parent, port);
+                if (!port) {
+                        ctx_dbg(1, ctx, "No port node found for csi2 port:%d\n",
+                                index);
+                        goto cleanup_exit;
+                }
+
+                /* Match the slice number with <REG> */
+                of_property_read_u32(port, "reg", &regval);
+                ctx_dbg(3, ctx, "port:%d inst:%d <reg>:%d\n",
+                        index, inst, regval);
+                if ((regval == inst) && (index == inst)) {
+                        found_port = 1;
+                        break;
+                }
+        }
+
+        if (!found_port) {
+                ctx_dbg(1, ctx, "No port node matches csi2 port:%d\n",
+                        inst);
+                goto cleanup_exit;
+        }
+
+        ctx_dbg(3, ctx, "Scanning sub-device for csi2 port: %d\n",
+                inst);
+
+        ep_node = of_get_next_endpoint(port, ep_node);
+        if (!ep_node) {
+                ctx_dbg(3, ctx, "can't get next endpoint\n");
+                goto cleanup_exit;
+        }
+
+        sensor_node = of_graph_get_remote_port_parent(ep_node);
+        if (!sensor_node) {
+                ctx_dbg(3, ctx, "can't get remote parent\n");
+                goto cleanup_exit;
+        }
+        asd->match_type = V4L2_ASYNC_MATCH_OF;
+        asd->match.of.node = sensor_node;
+
+        remote_ep = of_parse_phandle(ep_node, "remote-endpoint", 0);
+        if (!remote_ep) {
+                ctx_dbg(3, ctx, "can't get remote-endpoint\n");
+                goto cleanup_exit;
+        }
+        v4l2_of_parse_endpoint(remote_ep, endpoint);
+
+        if (endpoint->bus_type != V4L2_MBUS_CSI2) {
+                ctx_err(ctx, "Port:%d sub-device %s is not a CSI2 device\n",
+                        inst, sensor_node->name);
+                goto cleanup_exit;
+        }
+
+        /* Store Virtual Channel number */
+        ctx->virtual_channel = endpoint->base.id;
+
+        ctx_dbg(3, ctx, "Port:%d v4l2-endpoint: CSI2\n", inst);
+        ctx_dbg(3, ctx, "Virtual Channel=%d\n", ctx->virtual_channel);
+        ctx_dbg(3, ctx, "flags=0x%08x\n", endpoint->bus.mipi_csi2.flags);
+        ctx_dbg(3, ctx, "clock_lane=%d\n", endpoint->bus.mipi_csi2.clock_lane);
+        ctx_dbg(3, ctx, "num_data_lanes=%d\n",
+                endpoint->bus.mipi_csi2.num_data_lanes);
+        ctx_dbg(3, ctx, "data_lanes= <\n");
+        for (lane = 0; lane < endpoint->bus.mipi_csi2.num_data_lanes; lane++)
+                ctx_dbg(3, ctx, "\t%d\n",
+                        endpoint->bus.mipi_csi2.data_lanes[lane]);
+        ctx_dbg(3, ctx, "\t>\n");
+
+        ctx_dbg(1, ctx, "Port: %d found sub-device %s\n",
+                inst, sensor_node->name);
+
+        ctx->asd_list[0] = asd;
+        ctx->notifier.subdevs = ctx->asd_list;
+        ctx->notifier.num_subdevs = 1;
+        ctx->notifier.bound = cal_async_bound;
+        ctx->notifier.complete = cal_async_complete;
+        ret = v4l2_async_notifier_register(&ctx->v4l2_dev,
+                                           &ctx->notifier);
+        if (ret) {
+                ctx_err(ctx, "Error registering async notifier\n");
+                ret = -EINVAL;
+        }
+
+cleanup_exit:
+        if (!remote_ep)
+                of_node_put(remote_ep);
+        if (!sensor_node)
+                of_node_put(sensor_node);
+        if (!ep_node)
+                of_node_put(ep_node);
+        if (!port)
+                of_node_put(port);
+
+        return ret;
+}
+
+static struct cal_ctx *cal_create_instance(struct cal_dev *dev, int inst)
+{
+        struct cal_ctx *ctx;
+        struct v4l2_ctrl_handler *hdl;
+        int ret;
+
+        ctx = devm_kzalloc(&dev->pdev->dev, sizeof(*ctx), GFP_KERNEL);
+        if (!ctx)
+                return NULL;
+
+        /* save the cal_dev * for future ref */
+        ctx->dev = dev;
+
+        snprintf(ctx->v4l2_dev.name, sizeof(ctx->v4l2_dev.name),
+                 "%s-%03d", CAL_MODULE_NAME, inst);
+        ret = v4l2_device_register(&dev->pdev->dev, &ctx->v4l2_dev);
+        if (ret)
+                goto err_exit;
+
+        hdl = &ctx->ctrl_handler;
+        ret = v4l2_ctrl_handler_init(hdl, 11);
+        if (ret) {
+                ctx_err(ctx, "Failed to init ctrl handler\n");
+                goto unreg_dev;
+        }
+        ctx->v4l2_dev.ctrl_handler = hdl;
+
+        /* Make sure Camera Core H/W register area is available */
+        ctx->cc = dev->cc[inst];
+
+        /* Store the instance id */
+        ctx->csi2_port = inst + 1;
+
+        ret = of_cal_create_instance(ctx, inst);
+        if (ret) {
+                ret = -EINVAL;
+                goto free_hdl;
+        }
+        return ctx;
+
+free_hdl:
+        v4l2_ctrl_handler_free(hdl);
+unreg_dev:
+        v4l2_device_unregister(&ctx->v4l2_dev);
+err_exit:
+        return NULL;
+}
+
+static int cal_probe(struct platform_device *pdev)
+{
+        struct cal_dev *dev;
+        int ret;
+        int irq;
+
+        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+
+        /* set pseudo v4l2 device name so we can use v4l2_printk */
+        strlcpy(dev->v4l2_dev.name, CAL_MODULE_NAME,
+                sizeof(dev->v4l2_dev.name));
+
+        /* save pdev pointer */
+        dev->pdev = pdev;
+
+        dev->res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                "cal_top");
+        dev->base = devm_ioremap_resource(&pdev->dev, dev->res);
+        if (IS_ERR(dev->base))
+                return PTR_ERR(dev->base);
+
+        cal_dbg(1, dev, "ioresource %s at %pa - %pa\n",
+                dev->res->name, &dev->res->start, &dev->res->end);
+
+        irq = platform_get_irq(pdev, 0);
+        cal_dbg(1, dev, "got irq# %d\n", irq);
+        ret = devm_request_irq(&pdev->dev, irq, cal_irq, 0, CAL_MODULE_NAME,
+                               dev);
+        if (ret)
+                return ret;
+
+        platform_set_drvdata(pdev, dev);
+
+        dev->cm = cm_create(dev);
+        if (IS_ERR(dev->cm))
+                return PTR_ERR(dev->cm);
+
+        dev->cc[0] = cc_create(dev, 0);
+        if (IS_ERR(dev->cc[0]))
+                return PTR_ERR(dev->cc[0]);
+
+        dev->cc[1] = cc_create(dev, 1);
+        if (IS_ERR(dev->cc[1]))
+                return PTR_ERR(dev->cc[1]);
+
+        dev->ctx[0] = NULL;
+        dev->ctx[1] = NULL;
+
+        dev->ctx[0] = cal_create_instance(dev, 0);
+        dev->ctx[1] = cal_create_instance(dev, 1);
+        if (!dev->ctx[0] && !dev->ctx[1]) {
+                cal_err(dev, "Neither port is configured, no point in staying up\n");
+                return -ENODEV;
+        }
+
+        pm_runtime_enable(&pdev->dev);
+
+        ret = cal_runtime_get(dev);
+        if (ret)
+                goto runtime_disable;
+
+        /* Just check we can actually access the module */
+        cal_get_hwinfo(dev);
+
+        cal_runtime_put(dev);
+
+        return 0;
+
+runtime_disable:
+        pm_runtime_disable(&pdev->dev);
+        return ret;
+}
+
+static int cal_remove(struct platform_device *pdev)
+{
+        struct cal_dev *dev =
+                (struct cal_dev *)platform_get_drvdata(pdev);
+        struct cal_ctx *ctx;
+        int i;
+
+        cal_dbg(1, dev, "Removing %s\n", CAL_MODULE_NAME);
+
+        cal_runtime_get(dev);
+
+        for (i = 0; i < CAL_NUM_CONTEXT; i++) {
+                ctx = dev->ctx[i];
+                if (ctx) {
+                        ctx_dbg(1, ctx, "unregistering %s\n",
+                                video_device_node_name(&ctx->vdev));
+                        camerarx_phy_disable(ctx);
+                        v4l2_async_notifier_unregister(&ctx->notifier);
+                        vb2_dma_contig_cleanup_ctx(ctx->alloc_ctx);
+                        v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+                        v4l2_device_unregister(&ctx->v4l2_dev);
+                        video_unregister_device(&ctx->vdev);
+                }
+        }
+
+        cal_runtime_put(dev);
+        pm_runtime_disable(&pdev->dev);
+
+        return 0;
+}
+
+#if defined(CONFIG_OF)
+static const struct of_device_id cal_of_match[] = {
+        { .compatible = "ti,dra72-cal", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cal_of_match);
+#endif
+
+static struct platform_driver cal_pdrv = {
+        .probe          = cal_probe,
+        .remove         = cal_remove,
+        .driver         = {
+                .name   = CAL_MODULE_NAME,
+                .of_match_table = of_match_ptr(cal_of_match),
+        },
+};
+
+module_platform_driver(cal_pdrv);
diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h
new file mode 100644
index 000000000000..82b3dcf87128
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/cal_regs.h
@@ -0,0 +1,479 @@
+/*
+ * TI CAL camera interface driver
+ *
+ * Copyright (c) 2015 Texas Instruments Inc.
+ *
+ * Benoit Parrot, <bparrot@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef __TI_CAL_REGS_H
+#define __TI_CAL_REGS_H
+
+#define CAL_NUM_CSI2_PORTS              2
+
+/* CAL register offsets */
+
+#define CAL_HL_REVISION                 0x0000
+#define CAL_HL_HWINFO                   0x0004
+#define CAL_HL_SYSCONFIG                0x0010
+#define CAL_HL_IRQ_EOI                  0x001c
+#define CAL_HL_IRQSTATUS_RAW(m)         (0x20U + ((m-1) * 0x10U))
+#define CAL_HL_IRQSTATUS(m)             (0x24U + ((m-1) * 0x10U))
+#define CAL_HL_IRQENABLE_SET(m)         (0x28U + ((m-1) * 0x10U))
+#define CAL_HL_IRQENABLE_CLR(m)         (0x2cU + ((m-1) * 0x10U))
+#define CAL_PIX_PROC(m)                 (0xc0U + ((m-1) * 0x4U))
+#define CAL_CTRL                        0x100
+#define CAL_CTRL1                       0x104
+#define CAL_LINE_NUMBER_EVT             0x108
+#define CAL_VPORT_CTRL1                 0x120
+#define CAL_VPORT_CTRL2                 0x124
+#define CAL_BYS_CTRL1                   0x130
+#define CAL_BYS_CTRL2                   0x134
+#define CAL_RD_DMA_CTRL                 0x140
+#define CAL_RD_DMA_PIX_ADDR             0x144
+#define CAL_RD_DMA_PIX_OFST             0x148
+#define CAL_RD_DMA_XSIZE                0x14c
+#define CAL_RD_DMA_YSIZE                0x150
+#define CAL_RD_DMA_INIT_ADDR            0x154
+#define CAL_RD_DMA_INIT_OFST            0x168
+#define CAL_RD_DMA_CTRL2                0x16c
+#define CAL_WR_DMA_CTRL(m)              (0x200U + ((m-1) * 0x10U))
+#define CAL_WR_DMA_ADDR(m)              (0x204U + ((m-1) * 0x10U))
+#define CAL_WR_DMA_OFST(m)              (0x208U + ((m-1) * 0x10U))
+#define CAL_WR_DMA_XSIZE(m)             (0x20cU + ((m-1) * 0x10U))
+#define CAL_CSI2_PPI_CTRL(m)            (0x300U + ((m-1) * 0x80U))
+#define CAL_CSI2_COMPLEXIO_CFG(m)       (0x304U + ((m-1) * 0x80U))
+#define CAL_CSI2_COMPLEXIO_IRQSTATUS(m) (0x308U + ((m-1) * 0x80U))
+#define CAL_CSI2_SHORT_PACKET(m)        (0x30cU + ((m-1) * 0x80U))
+#define CAL_CSI2_COMPLEXIO_IRQENABLE(m) (0x310U + ((m-1) * 0x80U))
+#define CAL_CSI2_TIMING(m)              (0x314U + ((m-1) * 0x80U))
+#define CAL_CSI2_VC_IRQENABLE(m)        (0x318U + ((m-1) * 0x80U))
+#define CAL_CSI2_VC_IRQSTATUS(m)        (0x328U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX0(m)                (0x330U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX1(m)                (0x334U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX2(m)                (0x338U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX3(m)                (0x33cU + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX4(m)                (0x340U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX5(m)                (0x344U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX6(m)                (0x348U + ((m-1) * 0x80U))
+#define CAL_CSI2_CTX7(m)                (0x34cU + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS0(m)             (0x350U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS1(m)             (0x354U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS2(m)             (0x358U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS3(m)             (0x35cU + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS4(m)             (0x360U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS5(m)             (0x364U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS6(m)             (0x368U + ((m-1) * 0x80U))
+#define CAL_CSI2_STATUS7(m)             (0x36cU + ((m-1) * 0x80U))
+
+/* CAL CSI2 PHY register offsets */
+#define CAL_CSI2_PHY_REG0               0x000
+#define CAL_CSI2_PHY_REG1               0x004
+#define CAL_CSI2_PHY_REG2               0x008
+
+/* CAL Control Module Core Camerrx Control register offsets */
+#define CM_CTRL_CORE_CAMERRX_CONTROL    0x000
+
+/*********************************************************************
+* Generic value used in various field below
+*********************************************************************/
+
+#define CAL_GEN_DISABLE                 0
+#define CAL_GEN_ENABLE                  1
+#define CAL_GEN_FALSE                   0
+#define CAL_GEN_TRUE                    1
+
+/*********************************************************************
+* Field Definition Macros
+*********************************************************************/
+
+#define CAL_HL_REVISION_MINOR_MASK              GENMASK(5, 0)
+#define CAL_HL_REVISION_CUSTOM_MASK             GENMASK(7, 6)
+#define CAL_HL_REVISION_MAJOR_MASK              GENMASK(10, 8)
+#define CAL_HL_REVISION_RTL_MASK                GENMASK(15, 11)
+#define CAL_HL_REVISION_FUNC_MASK               GENMASK(27, 16)
+#define CAL_HL_REVISION_SCHEME_MASK             GENMASK(31, 30)
+#define CAL_HL_REVISION_SCHEME_H08                      1
+#define CAL_HL_REVISION_SCHEME_LEGACY                   0
+
+#define CAL_HL_HWINFO_WFIFO_MASK                GENMASK(3, 0)
+#define CAL_HL_HWINFO_RFIFO_MASK                GENMASK(7, 4)
+#define CAL_HL_HWINFO_PCTX_MASK                 GENMASK(12, 8)
+#define CAL_HL_HWINFO_WCTX_MASK                 GENMASK(18, 13)
+#define CAL_HL_HWINFO_VFIFO_MASK                GENMASK(22, 19)
+#define CAL_HL_HWINFO_NCPORT_MASK               GENMASK(27, 23)
+#define CAL_HL_HWINFO_NPPI_CTXS0_MASK           GENMASK(29, 28)
+#define CAL_HL_HWINFO_NPPI_CTXS1_MASK           GENMASK(31, 30)
+#define CAL_HL_HWINFO_NPPI_CONTEXTS_ZERO                0
+#define CAL_HL_HWINFO_NPPI_CONTEXTS_FOUR                1
+#define CAL_HL_HWINFO_NPPI_CONTEXTS_EIGHT               2
+#define CAL_HL_HWINFO_NPPI_CONTEXTS_RESERVED            3
+
+#define CAL_HL_SYSCONFIG_SOFTRESET_MASK         BIT_MASK(0)
+#define CAL_HL_SYSCONFIG_SOFTRESET_DONE                 0x0
+#define CAL_HL_SYSCONFIG_SOFTRESET_PENDING              0x1
+#define CAL_HL_SYSCONFIG_SOFTRESET_NOACTION             0x0
+#define CAL_HL_SYSCONFIG_SOFTRESET_RESET                0x1
+#define CAL_HL_SYSCONFIG_IDLE_MASK              GENMASK(3, 2)
+#define CAL_HL_SYSCONFIG_IDLEMODE_FORCE                 0
+#define CAL_HL_SYSCONFIG_IDLEMODE_NO                    1
+#define CAL_HL_SYSCONFIG_IDLEMODE_SMART1                2
+#define CAL_HL_SYSCONFIG_IDLEMODE_SMART2                3
+
+#define CAL_HL_IRQ_EOI_LINE_NUMBER_MASK         BIT_MASK(0)
+#define CAL_HL_IRQ_EOI_LINE_NUMBER_READ0                0
+#define CAL_HL_IRQ_EOI_LINE_NUMBER_EOI0                 0
+
+#define CAL_HL_IRQ_MASK(m)                      BIT_MASK(m-1)
+#define CAL_HL_IRQ_NOACTION                             0x0
+#define CAL_HL_IRQ_ENABLE                               0x1
+#define CAL_HL_IRQ_CLEAR                                0x1
+#define CAL_HL_IRQ_DISABLED                             0x0
+#define CAL_HL_IRQ_ENABLED                              0x1
+#define CAL_HL_IRQ_PENDING                              0x1
+
+#define CAL_PIX_PROC_EN_MASK                    BIT_MASK(0)
+#define CAL_PIX_PROC_EXTRACT_MASK               GENMASK(4, 1)
+#define CAL_PIX_PROC_EXTRACT_B6                         0x0
+#define CAL_PIX_PROC_EXTRACT_B7                         0x1
+#define CAL_PIX_PROC_EXTRACT_B8                         0x2
+#define CAL_PIX_PROC_EXTRACT_B10                        0x3
+#define CAL_PIX_PROC_EXTRACT_B10_MIPI                   0x4
+#define CAL_PIX_PROC_EXTRACT_B12                        0x5
+#define CAL_PIX_PROC_EXTRACT_B12_MIPI                   0x6
+#define CAL_PIX_PROC_EXTRACT_B14                        0x7
+#define CAL_PIX_PROC_EXTRACT_B14_MIPI                   0x8
+#define CAL_PIX_PROC_EXTRACT_B16_BE                     0x9
+#define CAL_PIX_PROC_EXTRACT_B16_LE                     0xa
+#define CAL_PIX_PROC_DPCMD_MASK                 GENMASK(9, 5)
+#define CAL_PIX_PROC_DPCMD_BYPASS                       0x0
+#define CAL_PIX_PROC_DPCMD_DPCM_10_8_1                  0x2
+#define CAL_PIX_PROC_DPCMD_DPCM_12_8_1                  0x8
+#define CAL_PIX_PROC_DPCMD_DPCM_10_7_1                  0x4
+#define CAL_PIX_PROC_DPCMD_DPCM_10_7_2                  0x5
+#define CAL_PIX_PROC_DPCMD_DPCM_10_6_1                  0x6
+#define CAL_PIX_PROC_DPCMD_DPCM_10_6_2                  0x7
+#define CAL_PIX_PROC_DPCMD_DPCM_12_7_1                  0xa
+#define CAL_PIX_PROC_DPCMD_DPCM_12_6_1                  0xc
+#define CAL_PIX_PROC_DPCMD_DPCM_14_10                   0xe
+#define CAL_PIX_PROC_DPCMD_DPCM_14_8_1                  0x10
+#define CAL_PIX_PROC_DPCMD_DPCM_16_12_1                 0x12
+#define CAL_PIX_PROC_DPCMD_DPCM_16_10_1                 0x14
+#define CAL_PIX_PROC_DPCMD_DPCM_16_8_1                  0x16
+#define CAL_PIX_PROC_DPCME_MASK                 GENMASK(15, 11)
+#define CAL_PIX_PROC_DPCME_BYPASS                       0x0
+#define CAL_PIX_PROC_DPCME_DPCM_10_8_1                  0x2
+#define CAL_PIX_PROC_DPCME_DPCM_12_8_1                  0x8
+#define CAL_PIX_PROC_DPCME_DPCM_14_10                   0xe
+#define CAL_PIX_PROC_DPCME_DPCM_14_8_1                  0x10
+#define CAL_PIX_PROC_DPCME_DPCM_16_12_1                 0x12
+#define CAL_PIX_PROC_DPCME_DPCM_16_10_1                 0x14
+#define CAL_PIX_PROC_DPCME_DPCM_16_8_1                  0x16
+#define CAL_PIX_PROC_PACK_MASK                  GENMASK(18, 16)
+#define CAL_PIX_PROC_PACK_B8                            0x0
+#define CAL_PIX_PROC_PACK_B10_MIPI                      0x2
+#define CAL_PIX_PROC_PACK_B12                           0x3
+#define CAL_PIX_PROC_PACK_B12_MIPI                      0x4
+#define CAL_PIX_PROC_PACK_B16                           0x5
+#define CAL_PIX_PROC_PACK_ARGB                          0x6
+#define CAL_PIX_PROC_CPORT_MASK                 GENMASK(23, 19)
+
+#define CAL_CTRL_POSTED_WRITES_MASK             BIT_MASK(0)
+#define CAL_CTRL_POSTED_WRITES_NONPOSTED                0
+#define CAL_CTRL_POSTED_WRITES                          1
+#define CAL_CTRL_TAGCNT_MASK                    GENMASK(4, 1)
+#define CAL_CTRL_BURSTSIZE_MASK                 GENMASK(6, 5)
+#define CAL_CTRL_BURSTSIZE_BURST16                      0x0
+#define CAL_CTRL_BURSTSIZE_BURST32                      0x1
+#define CAL_CTRL_BURSTSIZE_BURST64                      0x2
+#define CAL_CTRL_BURSTSIZE_BURST128                     0x3
+#define CAL_CTRL_LL_FORCE_STATE_MASK            GENMASK(12, 7)
+#define CAL_CTRL_MFLAGL_MASK                    GENMASK(20, 13)
+#define CAL_CTRL_PWRSCPCLK_MASK                 BIT_MASK(21)
+#define CAL_CTRL_PWRSCPCLK_AUTO                         0
+#define CAL_CTRL_PWRSCPCLK_FORCE                        1
+#define CAL_CTRL_RD_DMA_STALL_MASK              BIT_MASK(22)
+#define CAL_CTRL_MFLAGH_MASK                    GENMASK(31, 24)
+
+#define CAL_CTRL1_PPI_GROUPING_MASK             GENMASK(1, 0)
+#define CAL_CTRL1_PPI_GROUPING_DISABLED                 0
+#define CAL_CTRL1_PPI_GROUPING_RESERVED                 1
+#define CAL_CTRL1_PPI_GROUPING_0                        2
+#define CAL_CTRL1_PPI_GROUPING_1                        3
+#define CAL_CTRL1_INTERLEAVE01_MASK             GENMASK(3, 2)
+#define CAL_CTRL1_INTERLEAVE01_DISABLED                 0
+#define CAL_CTRL1_INTERLEAVE01_PIX1                     1
+#define CAL_CTRL1_INTERLEAVE01_PIX4                     2
+#define CAL_CTRL1_INTERLEAVE01_RESERVED                 3
+#define CAL_CTRL1_INTERLEAVE23_MASK             GENMASK(5, 4)
+#define CAL_CTRL1_INTERLEAVE23_DISABLED                 0
+#define CAL_CTRL1_INTERLEAVE23_PIX1                     1
+#define CAL_CTRL1_INTERLEAVE23_PIX4                     2
+#define CAL_CTRL1_INTERLEAVE23_RESERVED                 3
+
+#define CAL_LINE_NUMBER_EVT_CPORT_MASK          GENMASK(4, 0)
+#define CAL_LINE_NUMBER_EVT_MASK                GENMASK(29, 16)
+
+#define CAL_VPORT_CTRL1_PCLK_MASK               GENMASK(16, 0)
+#define CAL_VPORT_CTRL1_XBLK_MASK               GENMASK(24, 17)
+#define CAL_VPORT_CTRL1_YBLK_MASK               GENMASK(30, 25)
+#define CAL_VPORT_CTRL1_WIDTH_MASK              BIT_MASK(31)
+#define CAL_VPORT_CTRL1_WIDTH_ONE                       0
+#define CAL_VPORT_CTRL1_WIDTH_TWO                       1
+
+#define CAL_VPORT_CTRL2_CPORT_MASK              GENMASK(4, 0)
+#define CAL_VPORT_CTRL2_FREERUNNING_MASK        BIT_MASK(15)
+#define CAL_VPORT_CTRL2_FREERUNNING_GATED               0
+#define CAL_VPORT_CTRL2_FREERUNNING_FREE                1
+#define CAL_VPORT_CTRL2_FS_RESETS_MASK          BIT_MASK(16)
+#define CAL_VPORT_CTRL2_FS_RESETS_NO                    0
+#define CAL_VPORT_CTRL2_FS_RESETS_YES                   1
+#define CAL_VPORT_CTRL2_FSM_RESET_MASK          BIT_MASK(17)
+#define CAL_VPORT_CTRL2_FSM_RESET_NOEFFECT              0
+#define CAL_VPORT_CTRL2_FSM_RESET                       1
+#define CAL_VPORT_CTRL2_RDY_THR_MASK            GENMASK(31, 18)
+
+#define CAL_BYS_CTRL1_PCLK_MASK                 GENMASK(16, 0)
+#define CAL_BYS_CTRL1_XBLK_MASK                 GENMASK(24, 17)
+#define CAL_BYS_CTRL1_YBLK_MASK                 GENMASK(30, 25)
+#define CAL_BYS_CTRL1_BYSINEN_MASK              BIT_MASK(31)
+
+#define CAL_BYS_CTRL2_CPORTIN_MASK              GENMASK(4, 0)
+#define CAL_BYS_CTRL2_CPORTOUT_MASK             GENMASK(9, 5)
+#define CAL_BYS_CTRL2_DUPLICATEDDATA_MASK       BIT_MASK(10)
+#define CAL_BYS_CTRL2_DUPLICATEDDATA_NO                 0
+#define CAL_BYS_CTRL2_DUPLICATEDDATA_YES                1
+#define CAL_BYS_CTRL2_FREERUNNING_MASK          BIT_MASK(11)
+#define CAL_BYS_CTRL2_FREERUNNING_NO                    0
+#define CAL_BYS_CTRL2_FREERUNNING_YES                   1
+
+#define CAL_RD_DMA_CTRL_GO_MASK                 BIT_MASK(0)
+#define CAL_RD_DMA_CTRL_GO_DIS                          0
+#define CAL_RD_DMA_CTRL_GO_EN                           1
+#define CAL_RD_DMA_CTRL_GO_IDLE                         0
+#define CAL_RD_DMA_CTRL_GO_BUSY                         1
+#define CAL_RD_DMA_CTRL_INIT_MASK               BIT_MASK(1)
+#define CAL_RD_DMA_CTRL_BW_LIMITER_MASK         GENMASK(10, 2)
+#define CAL_RD_DMA_CTRL_OCP_TAG_CNT_MASK        GENMASK(14, 11)
+#define CAL_RD_DMA_CTRL_PCLK_MASK               GENMASK(31, 15)
+
+#define CAL_RD_DMA_PIX_ADDR_MASK                GENMASK(31, 3)
+
+#define CAL_RD_DMA_PIX_OFST_MASK                GENMASK(31, 4)
+
+#define CAL_RD_DMA_XSIZE_MASK                   GENMASK(31, 19)
+
+#define CAL_RD_DMA_YSIZE_MASK                   GENMASK(29, 16)
+
+#define CAL_RD_DMA_INIT_ADDR_MASK               GENMASK(31, 3)
+
+#define CAL_RD_DMA_INIT_OFST_MASK               GENMASK(31, 3)
+
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_MASK         GENMASK(2, 0)
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_DIS                  0
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_ONE                  1
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_FOUR                 2
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTEEN              3
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTYFOUR            4
+#define CAL_RD_DMA_CTRL2_CIRC_MODE_RESERVED             5
+#define CAL_RD_DMA_CTRL2_ICM_CSTART_MASK        BIT_MASK(3)
+#define CAL_RD_DMA_CTRL2_PATTERN_MASK           GENMASK(5, 4)
+#define CAL_RD_DMA_CTRL2_PATTERN_LINEAR                 0
+#define CAL_RD_DMA_CTRL2_PATTERN_YUV420                 1
+#define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP2               2
+#define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP4               3
+#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_MASK    BIT_MASK(6)
+#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_FREERUNNING     0
+#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_WAITFORBYSOUT   1
+#define CAL_RD_DMA_CTRL2_CIRC_SIZE_MASK         GENMASK(29, 16)
+
+#define CAL_WR_DMA_CTRL_MODE_MASK               GENMASK(2, 0)
+#define CAL_WR_DMA_CTRL_MODE_DIS                        0
+#define CAL_WR_DMA_CTRL_MODE_SHD                        1
+#define CAL_WR_DMA_CTRL_MODE_CNT                        2
+#define CAL_WR_DMA_CTRL_MODE_CNT_INIT                   3
+#define CAL_WR_DMA_CTRL_MODE_CONST                      4
+#define CAL_WR_DMA_CTRL_MODE_RESERVED                   5
+#define CAL_WR_DMA_CTRL_PATTERN_MASK            GENMASK(4, 3)
+#define CAL_WR_DMA_CTRL_PATTERN_LINEAR                  0
+#define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP2                2
+#define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP4                3
+#define CAL_WR_DMA_CTRL_PATTERN_RESERVED                1
+#define CAL_WR_DMA_CTRL_ICM_PSTART_MASK         BIT_MASK(5)
+#define CAL_WR_DMA_CTRL_DTAG_MASK               GENMASK(8, 6)
+#define CAL_WR_DMA_CTRL_DTAG_ATT_HDR                    0
+#define CAL_WR_DMA_CTRL_DTAG_ATT_DAT                    1
+#define CAL_WR_DMA_CTRL_DTAG                            2
+#define CAL_WR_DMA_CTRL_DTAG_PIX_HDR                    3
+#define CAL_WR_DMA_CTRL_DTAG_PIX_DAT                    4
+#define CAL_WR_DMA_CTRL_DTAG_D5                         5
+#define CAL_WR_DMA_CTRL_DTAG_D6                         6
+#define CAL_WR_DMA_CTRL_DTAG_D7                         7
+#define CAL_WR_DMA_CTRL_CPORT_MASK              GENMASK(13, 9)
+#define CAL_WR_DMA_CTRL_STALL_RD_MASK           BIT_MASK(14)
+#define CAL_WR_DMA_CTRL_YSIZE_MASK              GENMASK(31, 18)
+
+#define CAL_WR_DMA_ADDR_MASK                    GENMASK(31, 4)
+
+#define CAL_WR_DMA_OFST_MASK                    GENMASK(18, 4)
+#define CAL_WR_DMA_OFST_CIRC_MODE_MASK          GENMASK(23, 22)
+#define CAL_WR_DMA_OFST_CIRC_MODE_ONE                   1
+#define CAL_WR_DMA_OFST_CIRC_MODE_FOUR                  2
+#define CAL_WR_DMA_OFST_CIRC_MODE_SIXTYFOUR             3
+#define CAL_WR_DMA_OFST_CIRC_MODE_DISABLED              0
+#define CAL_WR_DMA_OFST_CIRC_SIZE_MASK          GENMASK(31, 24)
+
+#define CAL_WR_DMA_XSIZE_XSKIP_MASK             GENMASK(15, 3)
+#define CAL_WR_DMA_XSIZE_MASK                   GENMASK(31, 19)
+
+#define CAL_CSI2_PPI_CTRL_IF_EN_MASK            BIT_MASK(0)
+#define CAL_CSI2_PPI_CTRL_ECC_EN_MASK           BIT_MASK(2)
+#define CAL_CSI2_PPI_CTRL_FRAME_MASK            BIT_MASK(3)
+#define CAL_CSI2_PPI_CTRL_FRAME_IMMEDIATE               0
+#define CAL_CSI2_PPI_CTRL_FRAME                         1
+
+#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POSITION_MASK      GENMASK(2, 0)
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_5                       5
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_4                       4
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_3                       3
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_2                       2
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_1                       1
+#define CAL_CSI2_COMPLEXIO_CFG_POSITION_NOT_USED                0
+#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK           BIT_MASK(3)
+#define CAL_CSI2_COMPLEXIO_CFG_POL_PLUSMINUS                    0
+#define CAL_CSI2_COMPLEXIO_CFG_POL_MINUSPLUS                    1
+#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POSITION_MASK      GENMASK(6, 4)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POL_MASK           BIT_MASK(7)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POSITION_MASK      GENMASK(10, 8)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POL_MASK           BIT_MASK(11)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POSITION_MASK      GENMASK(14, 12)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POL_MASK           BIT_MASK(15)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POSITION_MASK      GENMASK(18, 16)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POL_MASK           BIT_MASK(19)
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_AUTO_MASK            BIT_MASK(24)
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_MASK          GENMASK(26, 25)
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_OFF             0
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_ON              1
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_ULP             2
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK             GENMASK(28, 27)
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF                0
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON                 1
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ULP                2
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK          BIT_MASK(29)
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETCOMPLETED        1
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETONGOING          0
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK          BIT_MASK(30)
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL                       0
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL           1
+
+#define CAL_CSI2_SHORT_PACKET_MASK      GENMASK(23, 0)
+
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS1_MASK           BIT_MASK(0)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS2_MASK           BIT_MASK(1)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS3_MASK           BIT_MASK(2)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS4_MASK           BIT_MASK(3)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS5_MASK           BIT_MASK(4)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1_MASK       BIT_MASK(5)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS2_MASK       BIT_MASK(6)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS3_MASK       BIT_MASK(7)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS4_MASK       BIT_MASK(8)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS5_MASK       BIT_MASK(9)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC1_MASK             BIT_MASK(10)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC2_MASK             BIT_MASK(11)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC3_MASK             BIT_MASK(12)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC4_MASK             BIT_MASK(13)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC5_MASK             BIT_MASK(14)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL1_MASK         BIT_MASK(15)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL2_MASK         BIT_MASK(16)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL3_MASK         BIT_MASK(17)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL4_MASK         BIT_MASK(18)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL5_MASK         BIT_MASK(19)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM1_MASK          BIT_MASK(20)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM2_MASK          BIT_MASK(21)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM3_MASK          BIT_MASK(22)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM4_MASK          BIT_MASK(23)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM5_MASK          BIT_MASK(24)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER_MASK   BIT_MASK(25)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT_MASK    BIT_MASK(26)
+#define CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK            BIT_MASK(27)
+#define CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK        BIT_MASK(28)
+#define CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK   BIT_MASK(30)
+
+#define CAL_CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK     GENMASK(12, 0)
+#define CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK          BIT_MASK(13)
+#define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK         BIT_MASK(14)
+#define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK          BIT_MASK(15)
+
+#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK                   BIT_MASK(0)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK                   BIT_MASK(1)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK                   BIT_MASK(2)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK                   BIT_MASK(3)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK                   BIT_MASK(4)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK      BIT_MASK(5)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK                   BIT_MASK(8)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK                   BIT_MASK(9)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK                   BIT_MASK(10)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK                   BIT_MASK(11)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK                   BIT_MASK(12)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK      BIT_MASK(13)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK                   BIT_MASK(16)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK                   BIT_MASK(17)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK                   BIT_MASK(18)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK                   BIT_MASK(19)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK                   BIT_MASK(20)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK      BIT_MASK(21)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK                   BIT_MASK(24)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK                   BIT_MASK(25)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK                   BIT_MASK(26)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK                   BIT_MASK(27)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK                   BIT_MASK(28)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK      BIT_MASK(29)
+
+#define CAL_CSI2_CTX_DT_MASK            GENMASK(5, 0)
+#define CAL_CSI2_CTX_VC_MASK            GENMASK(7, 6)
+#define CAL_CSI2_CTX_CPORT_MASK         GENMASK(12, 8)
+#define CAL_CSI2_CTX_ATT_MASK           BIT_MASK(13)
+#define CAL_CSI2_CTX_ATT_PIX                    0
+#define CAL_CSI2_CTX_ATT                        1
+#define CAL_CSI2_CTX_PACK_MODE_MASK     BIT_MASK(14)
+#define CAL_CSI2_CTX_PACK_MODE_LINE             0
+#define CAL_CSI2_CTX_PACK_MODE_FRAME            1
+#define CAL_CSI2_CTX_LINES_MASK         GENMASK(29, 16)
+
+#define CAL_CSI2_STATUS_FRAME_MASK      GENMASK(15, 0)
+
+#define CAL_CSI2_PHY_REG0_THS_SETTLE_MASK       GENMASK(7, 0)
+#define CAL_CSI2_PHY_REG0_THS_TERM_MASK         GENMASK(15, 8)
+#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK    BIT_MASK(24)
+#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_DISABLE         1
+#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_ENABLE          0
+
+#define CAL_CSI2_PHY_REG1_TCLK_SETTLE_MASK                      GENMASK(7, 0)
+#define CAL_CSI2_PHY_REG1_CTRLCLK_DIV_FACTOR_MASK               GENMASK(9, 8)
+#define CAL_CSI2_PHY_REG1_DPHY_HS_SYNC_PATTERN_MASK             GENMASK(17, 10)
+#define CAL_CSI2_PHY_REG1_TCLK_TERM_MASK                        GENMASK(24, 18)
+#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_MASK       BIT_MASK(25)
+#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_ERROR              1
+#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_SUCCESS            0
+#define CAL_CSI2_PHY_REG1_RESET_DONE_STATUS_MASK                GENMASK(29, 28)
+
+#define CAL_CSI2_PHY_REG2_CCP2_SYNC_PATTERN_MASK                GENMASK(23, 0)
+#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC3_MASK           GENMASK(25, 24)
+#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC2_MASK           GENMASK(27, 26)
+#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC1_MASK           GENMASK(29, 28)
+#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC0_MASK           GENMASK(31, 30)
+
+#define CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK                     BIT_MASK(0)
+#define CM_CAMERRX_CTRL_CSI1_CAMMODE_MASK                       GENMASK(2, 1)
+#define CM_CAMERRX_CTRL_CSI1_LANEENABLE_MASK                    GENMASK(4, 3)
+#define CM_CAMERRX_CTRL_CSI1_MODE_MASK                          BIT_MASK(5)
+#define CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK                     BIT_MASK(10)
+#define CM_CAMERRX_CTRL_CSI0_CAMMODE_MASK                       GENMASK(12, 11)
+#define CM_CAMERRX_CTRL_CSI0_LANEENABLE_MASK                    GENMASK(16, 13)
+#define CM_CAMERRX_CTRL_CSI0_MODE_MASK                          BIT_MASK(17)
+
+#endif
diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index 418113c99801..c4b5fab83666 100644
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -1074,7 +1074,7 @@ static int __init vim2m_init(void)
         if (ret)
                 platform_device_unregister(&vim2m_pdev);
 
-        return 0;
+        return ret;
 }
 
 module_init(vim2m_init);
diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c
index e15eef6a94e5..bdc380b14e0c 100644
--- a/drivers/media/platform/vivid/vivid-osd.c
+++ b/drivers/media/platform/vivid/vivid-osd.c
@@ -360,7 +360,7 @@ void vivid_fb_release_buffers(struct vivid_dev *dev)
 
         /* Release pseudo palette */
         kfree(dev->fb_info.pseudo_palette);
-        kfree((void *)dev->video_vbase);
+        kfree(dev->video_vbase);
 }
 
 /* Initialize the specified card */
diff --git a/drivers/media/platform/vivid/vivid-tpg.h b/drivers/media/platform/vivid/vivid-tpg.h
index 9baed6a10334..93fbaee69675 100644
--- a/drivers/media/platform/vivid/vivid-tpg.h
+++ b/drivers/media/platform/vivid/vivid-tpg.h
@@ -418,6 +418,8 @@ static inline void tpg_s_bytesperline(struct tpg_data *tpg, unsigned plane, unsi
 
                 tpg->bytesperline[p] = plane_w / tpg->hdownsampling[p];
         }
+        if (tpg_g_interleaved(tpg))
+                tpg->bytesperline[1] = tpg->bytesperline[0];
 }
 
 
diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/vsp1/Makefile
index 6a93f928dfde..95b3ac2ea7ef 100644
--- a/drivers/media/platform/vsp1/Makefile
+++ b/drivers/media/platform/vsp1/Makefile
@@ -1,4 +1,5 @@
-vsp1-y                                  := vsp1_drv.o vsp1_entity.o vsp1_video.o
+vsp1-y                                  := vsp1_drv.o vsp1_entity.o vsp1_pipe.o
+vsp1-y                                  += vsp1_dl.o vsp1_drm.o vsp1_video.o
 vsp1-y                                  += vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
 vsp1-y                                  += vsp1_hsit.o vsp1_lif.o vsp1_lut.o
 vsp1-y                                  += vsp1_bru.o vsp1_sru.o vsp1_uds.o
diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/vsp1/vsp1.h
index 989e96f7e360..910d6b8e8b50 100644
--- a/drivers/media/platform/vsp1/vsp1.h
+++ b/drivers/media/platform/vsp1/vsp1.h
@@ -26,6 +26,9 @@
 struct clk;
 struct device;
 
+struct vsp1_dl;
+struct vsp1_drm;
+struct vsp1_entity;
 struct vsp1_platform_data;
 struct vsp1_bru;
 struct vsp1_hsit;
@@ -42,17 +45,21 @@ struct vsp1_uds;
 #define VSP1_HAS_LIF            (1 << 0)
 #define VSP1_HAS_LUT            (1 << 1)
 #define VSP1_HAS_SRU            (1 << 2)
+#define VSP1_HAS_BRU            (1 << 3)
 
-struct vsp1_platform_data {
+struct vsp1_device_info {
+        u32 version;
         unsigned int features;
         unsigned int rpf_count;
         unsigned int uds_count;
         unsigned int wpf_count;
+        unsigned int num_bru_inputs;
+        bool uapi;
 };
 
 struct vsp1_device {
         struct device *dev;
-        struct vsp1_platform_data pdata;
+        const struct vsp1_device_info *info;
 
         void __iomem *mmio;
         struct clk *clock;
@@ -71,14 +78,22 @@ struct vsp1_device {
         struct vsp1_rwpf *wpf[VSP1_MAX_WPF];
 
         struct list_head entities;
+        struct list_head videos;
 
         struct v4l2_device v4l2_dev;
         struct media_device media_dev;
+        struct media_entity_operations media_ops;
+
+        struct vsp1_drm *drm;
+
+        bool use_dl;
 };
 
 int vsp1_device_get(struct vsp1_device *vsp1);
 void vsp1_device_put(struct vsp1_device *vsp1);
 
+int vsp1_reset_wpf(struct vsp1_device *vsp1, unsigned int index);
+
 static inline u32 vsp1_read(struct vsp1_device *vsp1, u32 reg)
 {
         return ioread32(vsp1->mmio + reg);
@@ -89,4 +104,14 @@ static inline void vsp1_write(struct vsp1_device *vsp1, u32 reg, u32 data)
         iowrite32(data, vsp1->mmio + reg);
 }
 
+#include "vsp1_dl.h"
+
+static inline void vsp1_mod_write(struct vsp1_entity *e, u32 reg, u32 data)
+{
+        if (e->vsp1->use_dl)
+                vsp1_dl_add(e, reg, data);
+        else
+                vsp1_write(e->vsp1, reg, data);
+}
+
 #endif /* __VSP1_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_bru.c b/drivers/media/platform/vsp1/vsp1_bru.c
index 7dd763311c0f..cb0dbc15ddad 100644
--- a/drivers/media/platform/vsp1/vsp1_bru.c
+++ b/drivers/media/platform/vsp1/vsp1_bru.c
@@ -19,6 +19,7 @@
 #include "vsp1.h"
 #include "vsp1_bru.h"
 #include "vsp1_rwpf.h"
+#include "vsp1_video.h"
 
 #define BRU_MIN_SIZE                            1U
 #define BRU_MAX_SIZE                            8190U
@@ -27,14 +28,9 @@
  * Device Access
  */
 
-static inline u32 vsp1_bru_read(struct vsp1_bru *bru, u32 reg)
-{
-        return vsp1_read(bru->entity.vsp1, reg);
-}
-
 static inline void vsp1_bru_write(struct vsp1_bru *bru, u32 reg, u32 data)
 {
-        vsp1_write(bru->entity.vsp1, reg, data);
+        vsp1_mod_write(&bru->entity, reg, data);
 }
 
 /* -----------------------------------------------------------------------------
@@ -83,7 +79,7 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
         if (!enable)
                 return 0;
 
-        format = &bru->entity.formats[BRU_PAD_SOURCE];
+        format = &bru->entity.formats[bru->entity.source_pad];
 
         /* The hardware is extremely flexible but we have no userspace API to
          * expose all the parameters, nor is it clear whether we would have use
@@ -94,7 +90,7 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
         /* Disable dithering and enable color data normalization unless the
          * format at the pipeline output is premultiplied.
          */
-        flags = pipe->output ? pipe->output->video.format.flags : 0;
+        flags = pipe->output ? pipe->output->format.flags : 0;
         vsp1_bru_write(bru, VI6_BRU_INCTRL,
                        flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ?
                        0 : VI6_BRU_INCTRL_NRM);
@@ -113,7 +109,7 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
                        VI6_BRU_ROP_CROP(VI6_ROP_NOP) |
                        VI6_BRU_ROP_AROP(VI6_ROP_NOP));
 
-        for (i = 0; i < 4; ++i) {
+        for (i = 0; i < bru->entity.source_pad; ++i) {
                 bool premultiplied = false;
                 u32 ctrl = 0;
 
@@ -125,7 +121,7 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
                 if (bru->inputs[i].rpf) {
                         ctrl |= VI6_BRU_CTRL_RBC;
 
-                        premultiplied = bru->inputs[i].rpf->video.format.flags
+                        premultiplied = bru->inputs[i].rpf->format.flags
                                       & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA;
                 } else {
                         ctrl |= VI6_BRU_CTRL_CROP(VI6_ROP_NOP)
@@ -295,7 +291,7 @@ static int bru_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_con
         *format = fmt->format;
 
         /* Reset the compose rectangle */
-        if (fmt->pad != BRU_PAD_SOURCE) {
+        if (fmt->pad != bru->entity.source_pad) {
                 struct v4l2_rect *compose;
 
                 compose = bru_get_compose(bru, cfg, fmt->pad, fmt->which);
@@ -309,7 +305,7 @@ static int bru_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_con
         if (fmt->pad == BRU_PAD_SINK(0)) {
                 unsigned int i;
 
-                for (i = 0; i <= BRU_PAD_SOURCE; ++i) {
+                for (i = 0; i <= bru->entity.source_pad; ++i) {
                         format = vsp1_entity_get_pad_format(&bru->entity, cfg,
                                                             i, fmt->which);
                         format->code = fmt->format.code;
@@ -325,7 +321,7 @@ static int bru_get_selection(struct v4l2_subdev *subdev,
 {
         struct vsp1_bru *bru = to_bru(subdev);
 
-        if (sel->pad == BRU_PAD_SOURCE)
+        if (sel->pad == bru->entity.source_pad)
                 return -EINVAL;
 
         switch (sel->target) {
@@ -353,7 +349,7 @@ static int bru_set_selection(struct v4l2_subdev *subdev,
         struct v4l2_mbus_framefmt *format;
         struct v4l2_rect *compose;
 
-        if (sel->pad == BRU_PAD_SOURCE)
+        if (sel->pad == bru->entity.source_pad)
                 return -EINVAL;
 
         if (sel->target != V4L2_SEL_TGT_COMPOSE)
@@ -362,8 +358,8 @@ static int bru_set_selection(struct v4l2_subdev *subdev,
         /* The compose rectangle top left corner must be inside the output
          * frame.
          */
-        format = vsp1_entity_get_pad_format(&bru->entity, cfg, BRU_PAD_SOURCE,
-                                            sel->which);
+        format = vsp1_entity_get_pad_format(&bru->entity, cfg,
+                                            bru->entity.source_pad, sel->which);
         sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);
         sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
 
@@ -419,7 +415,8 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1)
 
         bru->entity.type = VSP1_ENTITY_BRU;
 
-        ret = vsp1_entity_init(vsp1, &bru->entity, 5);
+        ret = vsp1_entity_init(vsp1, &bru->entity,
+                               vsp1->info->num_bru_inputs + 1);
         if (ret < 0)
                 return ERR_PTR(ret);
 
@@ -427,7 +424,7 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1)
         subdev = &bru->entity.subdev;
         v4l2_subdev_init(subdev, &bru_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s bru",
                  dev_name(vsp1->dev));
diff --git a/drivers/media/platform/vsp1/vsp1_bru.h b/drivers/media/platform/vsp1/vsp1_bru.h
index 16b1c6554911..dbac9686ea69 100644
--- a/drivers/media/platform/vsp1/vsp1_bru.h
+++ b/drivers/media/platform/vsp1/vsp1_bru.h
@@ -23,7 +23,6 @@ struct vsp1_device;
 struct vsp1_rwpf;
 
 #define BRU_PAD_SINK(n)                         (n)
-#define BRU_PAD_SOURCE                          4
 
 struct vsp1_bru {
         struct vsp1_entity entity;
@@ -33,7 +32,7 @@ struct vsp1_bru {
         struct {
                 struct vsp1_rwpf *rpf;
                 struct v4l2_rect compose;
-        } inputs[4];
+        } inputs[VSP1_MAX_RPF];
 };
 
 static inline struct vsp1_bru *to_bru(struct v4l2_subdev *subdev)
diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c
new file mode 100644
index 000000000000..7dc27ac6bd02
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_dl.c
@@ -0,0 +1,305 @@
+/*
+ * vsp1_dl.h  --  R-Car VSP1 Display List
+ *
+ * Copyright (C) 2015 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/gfp.h>
+#include <linux/slab.h>
+
+#include "vsp1.h"
+#include "vsp1_dl.h"
+#include "vsp1_pipe.h"
+
+/*
+ * Global resources
+ *
+ * - Display-related interrupts (can be used for vblank evasion ?)
+ * - Display-list enable
+ * - Header-less for WPF0
+ * - DL swap
+ */
+
+#define VSP1_DL_BODY_SIZE               (2 * 4 * 256)
+#define VSP1_DL_NUM_LISTS               3
+
+struct vsp1_dl_entry {
+        u32 addr;
+        u32 data;
+} __attribute__((__packed__));
+
+struct vsp1_dl_list {
+        size_t size;
+        int reg_count;
+
+        bool in_use;
+
+        struct vsp1_dl_entry *body;
+        dma_addr_t dma;
+};
+
+/**
+ * struct vsp1_dl - Display List manager
+ * @vsp1: the VSP1 device
+ * @lock: protects the active, queued and pending lists
+ * @lists.all: array of all allocate display lists
+ * @lists.active: list currently being processed (loaded) by hardware
+ * @lists.queued: list queued to the hardware (written to the DL registers)
+ * @lists.pending: list waiting to be queued to the hardware
+ * @lists.write: list being written to by software
+ */
+struct vsp1_dl {
+        struct vsp1_device *vsp1;
+
+        spinlock_t lock;
+
+        size_t size;
+        dma_addr_t dma;
+        void *mem;
+
+        struct {
+                struct vsp1_dl_list all[VSP1_DL_NUM_LISTS];
+
+                struct vsp1_dl_list *active;
+                struct vsp1_dl_list *queued;
+                struct vsp1_dl_list *pending;
+                struct vsp1_dl_list *write;
+        } lists;
+};
+
+/* -----------------------------------------------------------------------------
+ * Display List Transaction Management
+ */
+
+static void vsp1_dl_free_list(struct vsp1_dl_list *list)
+{
+        if (!list)
+                return;
+
+        list->in_use = false;
+}
+
+void vsp1_dl_reset(struct vsp1_dl *dl)
+{
+        unsigned int i;
+
+        dl->lists.active = NULL;
+        dl->lists.queued = NULL;
+        dl->lists.pending = NULL;
+        dl->lists.write = NULL;
+
+        for (i = 0; i < ARRAY_SIZE(dl->lists.all); ++i)
+                dl->lists.all[i].in_use = false;
+}
+
+void vsp1_dl_begin(struct vsp1_dl *dl)
+{
+        struct vsp1_dl_list *list = NULL;
+        unsigned long flags;
+        unsigned int i;
+
+        spin_lock_irqsave(&dl->lock, flags);
+
+        for (i = 0; i < ARRAY_SIZE(dl->lists.all); ++i) {
+                if (!dl->lists.all[i].in_use) {
+                        list = &dl->lists.all[i];
+                        break;
+                }
+        }
+
+        if (!list) {
+                list = dl->lists.pending;
+                dl->lists.pending = NULL;
+        }
+
+        spin_unlock_irqrestore(&dl->lock, flags);
+
+        dl->lists.write = list;
+
+        list->in_use = true;
+        list->reg_count = 0;
+}
+
+void vsp1_dl_add(struct vsp1_entity *e, u32 reg, u32 data)
+{
+        struct vsp1_pipeline *pipe = to_vsp1_pipeline(&e->subdev.entity);
+        struct vsp1_dl *dl = pipe->dl;
+        struct vsp1_dl_list *list = dl->lists.write;
+
+        list->body[list->reg_count].addr = reg;
+        list->body[list->reg_count].data = data;
+        list->reg_count++;
+}
+
+void vsp1_dl_commit(struct vsp1_dl *dl)
+{
+        struct vsp1_device *vsp1 = dl->vsp1;
+        struct vsp1_dl_list *list;
+        unsigned long flags;
+        bool update;
+
+        list = dl->lists.write;
+        dl->lists.write = NULL;
+
+        spin_lock_irqsave(&dl->lock, flags);
+
+        /* Once the UPD bit has been set the hardware can start processing the
+         * display list at any time and we can't touch the address and size
+         * registers. In that case mark the update as pending, it will be
+         * queued up to the hardware by the frame end interrupt handler.
+         */
+        update = !!(vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD);
+        if (update) {
+                vsp1_dl_free_list(dl->lists.pending);
+                dl->lists.pending = list;
+                goto done;
+        }
+
+        /* Program the hardware with the display list body address and size.
+         * The UPD bit will be cleared by the device when the display list is
+         * processed.
+         */
+        vsp1_write(vsp1, VI6_DL_HDR_ADDR(0), list->dma);
+        vsp1_write(vsp1, VI6_DL_BODY_SIZE, VI6_DL_BODY_SIZE_UPD |
+                   (list->reg_count * 8));
+
+        vsp1_dl_free_list(dl->lists.queued);
+        dl->lists.queued = list;
+
+done:
+        spin_unlock_irqrestore(&dl->lock, flags);
+}
+
+/* -----------------------------------------------------------------------------
+ * Interrupt Handling
+ */
+
+void vsp1_dl_irq_display_start(struct vsp1_dl *dl)
+{
+        spin_lock(&dl->lock);
+
+        /* The display start interrupt signals the end of the display list
+         * processing by the device. The active display list, if any, won't be
+         * accessed anymore and can be reused.
+         */
+        if (dl->lists.active) {
+                vsp1_dl_free_list(dl->lists.active);
+                dl->lists.active = NULL;
+        }
+
+        spin_unlock(&dl->lock);
+}
+
+void vsp1_dl_irq_frame_end(struct vsp1_dl *dl)
+{
+        struct vsp1_device *vsp1 = dl->vsp1;
+
+        spin_lock(&dl->lock);
+
+        /* The UPD bit set indicates that the commit operation raced with the
+         * interrupt and occurred after the frame end event and UPD clear but
+         * before interrupt processing. The hardware hasn't taken the update
+         * into account yet, we'll thus skip one frame and retry.
+         */
+        if (vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD)
+                goto done;
+
+        /* The device starts processing the queued display list right after the
+         * frame end interrupt. The display list thus becomes active.
+         */
+        if (dl->lists.queued) {
+                WARN_ON(dl->lists.active);
+                dl->lists.active = dl->lists.queued;
+                dl->lists.queued = NULL;
+        }
+
+        /* Now that the UPD bit has been cleared we can queue the next display
+         * list to the hardware if one has been prepared.
+         */
+        if (dl->lists.pending) {
+                struct vsp1_dl_list *list = dl->lists.pending;
+
+                vsp1_write(vsp1, VI6_DL_HDR_ADDR(0), list->dma);
+                vsp1_write(vsp1, VI6_DL_BODY_SIZE, VI6_DL_BODY_SIZE_UPD |
+                           (list->reg_count * 8));
+
+                dl->lists.queued = list;
+                dl->lists.pending = NULL;
+        }
+
+done:
+        spin_unlock(&dl->lock);
+}
+
+/* -----------------------------------------------------------------------------
+ * Hardware Setup
+ */
+
+void vsp1_dl_setup(struct vsp1_device *vsp1)
+{
+        u32 ctrl = (256 << VI6_DL_CTRL_AR_WAIT_SHIFT)
+                 | VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0
+                 | VI6_DL_CTRL_DLE;
+
+        /* The DRM pipeline operates with header-less display lists in
+         * Continuous Frame Mode.
+         */
+        if (vsp1->drm)
+                ctrl |= VI6_DL_CTRL_CFM0 | VI6_DL_CTRL_NH0;
+
+        vsp1_write(vsp1, VI6_DL_CTRL, ctrl);
+        vsp1_write(vsp1, VI6_DL_SWAP, VI6_DL_SWAP_LWS);
+}
+
+/* -----------------------------------------------------------------------------
+ * Initialization and Cleanup
+ */
+
+struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1)
+{
+        struct vsp1_dl *dl;
+        unsigned int i;
+
+        dl = kzalloc(sizeof(*dl), GFP_KERNEL);
+        if (!dl)
+                return NULL;
+
+        spin_lock_init(&dl->lock);
+
+        dl->vsp1 = vsp1;
+        dl->size = VSP1_DL_BODY_SIZE * ARRAY_SIZE(dl->lists.all);
+
+        dl->mem = dma_alloc_writecombine(vsp1->dev, dl->size, &dl->dma,
+                                         GFP_KERNEL);
+        if (!dl->mem) {
+                kfree(dl);
+                return NULL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(dl->lists.all); ++i) {
+                struct vsp1_dl_list *list = &dl->lists.all[i];
+
+                list->size = VSP1_DL_BODY_SIZE;
+                list->reg_count = 0;
+                list->in_use = false;
+                list->dma = dl->dma + VSP1_DL_BODY_SIZE * i;
+                list->body = dl->mem + VSP1_DL_BODY_SIZE * i;
+        }
+
+        return dl;
+}
+
+void vsp1_dl_destroy(struct vsp1_dl *dl)
+{
+        dma_free_writecombine(dl->vsp1->dev, dl->size, dl->mem, dl->dma);
+        kfree(dl);
+}
diff --git a/drivers/media/platform/vsp1/vsp1_dl.h b/drivers/media/platform/vsp1/vsp1_dl.h
new file mode 100644
index 000000000000..448c4250e54c
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_dl.h
@@ -0,0 +1,42 @@
+/*
+ * vsp1_dl.h  --  R-Car VSP1 Display List
+ *
+ * Copyright (C) 2015 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __VSP1_DL_H__
+#define __VSP1_DL_H__
+
+#include "vsp1_entity.h"
+
+struct vsp1_device;
+struct vsp1_dl;
+
+struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1);
+void vsp1_dl_destroy(struct vsp1_dl *dl);
+
+void vsp1_dl_setup(struct vsp1_device *vsp1);
+
+void vsp1_dl_reset(struct vsp1_dl *dl);
+void vsp1_dl_begin(struct vsp1_dl *dl);
+void vsp1_dl_add(struct vsp1_entity *e, u32 reg, u32 data);
+void vsp1_dl_commit(struct vsp1_dl *dl);
+
+void vsp1_dl_irq_display_start(struct vsp1_dl *dl);
+void vsp1_dl_irq_frame_end(struct vsp1_dl *dl);
+
+static inline void vsp1_dl_mod_write(struct vsp1_entity *e, u32 reg, u32 data)
+{
+        if (e->vsp1->use_dl)
+                vsp1_dl_add(e, reg, data);
+        else
+                vsp1_write(e->vsp1, reg, data);
+}
+
+#endif /* __VSP1_DL_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
new file mode 100644
index 000000000000..021fe5778cd1
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -0,0 +1,597 @@
+/*
+ * vsp1_drm.c  --  R-Car VSP1 DRM API
+ *
+ * Copyright (C) 2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/vsp1.h>
+
+#include <media/media-entity.h>
+#include <media/v4l2-subdev.h>
+
+#include "vsp1.h"
+#include "vsp1_bru.h"
+#include "vsp1_dl.h"
+#include "vsp1_drm.h"
+#include "vsp1_lif.h"
+#include "vsp1_pipe.h"
+#include "vsp1_rwpf.h"
+
+/* -----------------------------------------------------------------------------
+ * Runtime Handling
+ */
+
+static void vsp1_drm_pipeline_frame_end(struct vsp1_pipeline *pipe)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+        if (pipe->num_inputs)
+                vsp1_pipeline_run(pipe);
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+}
+
+/* -----------------------------------------------------------------------------
+ * DU Driver API
+ */
+
+int vsp1_du_init(struct device *dev)
+{
+        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+
+        if (!vsp1)
+                return -EPROBE_DEFER;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vsp1_du_init);
+
+/**
+ * vsp1_du_setup_lif - Setup the output part of the VSP pipeline
+ * @dev: the VSP device
+ * @width: output frame width in pixels
+ * @height: output frame height in pixels
+ *
+ * Configure the output part of VSP DRM pipeline for the given frame @width and
+ * @height. This sets up formats on the BRU source pad, the WPF0 sink and source
+ * pads, and the LIF sink pad.
+ *
+ * As the media bus code on the BRU source pad is conditioned by the
+ * configuration of the BRU sink 0 pad, we also set up the formats on all BRU
+ * sinks, even if the configuration will be overwritten later by
+ * vsp1_du_setup_rpf(). This ensures that the BRU configuration is set to a well
+ * defined state.
+ *
+ * Return 0 on success or a negative error code on failure.
+ */
+int vsp1_du_setup_lif(struct device *dev, unsigned int width,
+                      unsigned int height)
+{
+        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+        struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
+        struct vsp1_bru *bru = vsp1->bru;
+        struct v4l2_subdev_format format;
+        unsigned int i;
+        int ret;
+
+        dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",
+                __func__, width, height);
+
+        if (width == 0 || height == 0) {
+                /* Zero width or height means the CRTC is being disabled, stop
+                 * the pipeline and turn the light off.
+                 */
+                ret = vsp1_pipeline_stop(pipe);
+                if (ret == -ETIMEDOUT)
+                        dev_err(vsp1->dev, "DRM pipeline stop timeout\n");
+
+                media_entity_pipeline_stop(&pipe->output->entity.subdev.entity);
+
+                for (i = 0; i < bru->entity.source_pad; ++i) {
+                        bru->inputs[i].rpf = NULL;
+                        pipe->inputs[i] = NULL;
+                }
+
+                pipe->num_inputs = 0;
+
+                vsp1_device_put(vsp1);
+
+                dev_dbg(vsp1->dev, "%s: pipeline disabled\n", __func__);
+
+                return 0;
+        }
+
+        vsp1_dl_reset(vsp1->drm->dl);
+
+        /* Configure the format at the BRU sinks and propagate it through the
+         * pipeline.
+         */
+        memset(&format, 0, sizeof(format));
+        format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+
+        for (i = 0; i < bru->entity.source_pad; ++i) {
+                format.pad = i;
+
+                format.format.width = width;
+                format.format.height = height;
+                format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;
+                format.format.field = V4L2_FIELD_NONE;
+
+                ret = v4l2_subdev_call(&bru->entity.subdev, pad,
+                                       set_fmt, NULL, &format);
+                if (ret < 0)
+                        return ret;
+
+                dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on BRU pad %u\n",
+                        __func__, format.format.width, format.format.height,
+                        format.format.code, i);
+        }
+
+        format.pad = bru->entity.source_pad;
+        format.format.width = width;
+        format.format.height = height;
+        format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;
+        format.format.field = V4L2_FIELD_NONE;
+
+        ret = v4l2_subdev_call(&bru->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on BRU pad %u\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code, i);
+
+        format.pad = RWPF_PAD_SINK;
+        ret = v4l2_subdev_call(&vsp1->wpf[0]->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on WPF0 sink\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code);
+
+        format.pad = RWPF_PAD_SOURCE;
+        ret = v4l2_subdev_call(&vsp1->wpf[0]->entity.subdev, pad, get_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev, "%s: got format %ux%u (%x) on WPF0 source\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code);
+
+        format.pad = LIF_PAD_SINK;
+        ret = v4l2_subdev_call(&vsp1->lif->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on LIF sink\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code);
+
+        /* Verify that the format at the output of the pipeline matches the
+         * requested frame size and media bus code.
+         */
+        if (format.format.width != width || format.format.height != height ||
+            format.format.code != MEDIA_BUS_FMT_ARGB8888_1X32) {
+                dev_dbg(vsp1->dev, "%s: format mismatch\n", __func__);
+                return -EPIPE;
+        }
+
+        /* Mark the pipeline as streaming and enable the VSP1. This will store
+         * the pipeline pointer in all entities, which the s_stream handlers
+         * will need. We don't start the entities themselves right at this point
+         * as there's no plane configured yet, so we can't start processing
+         * buffers.
+         */
+        ret = vsp1_device_get(vsp1);
+        if (ret < 0)
+                return ret;
+
+        ret = media_entity_pipeline_start(&pipe->output->entity.subdev.entity,
+                                          &pipe->pipe);
+        if (ret < 0) {
+                dev_dbg(vsp1->dev, "%s: pipeline start failed\n", __func__);
+                vsp1_device_put(vsp1);
+                return ret;
+        }
+
+        dev_dbg(vsp1->dev, "%s: pipeline enabled\n", __func__);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vsp1_du_setup_lif);
+
+/**
+ * vsp1_du_atomic_begin - Prepare for an atomic update
+ * @dev: the VSP device
+ */
+void vsp1_du_atomic_begin(struct device *dev)
+{
+        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+        struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
+        unsigned long flags;
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+
+        vsp1->drm->num_inputs = pipe->num_inputs;
+
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+        /* Prepare the display list. */
+        vsp1_dl_begin(vsp1->drm->dl);
+}
+EXPORT_SYMBOL_GPL(vsp1_du_atomic_begin);
+
+/**
+ * vsp1_du_atomic_update - Setup one RPF input of the VSP pipeline
+ * @dev: the VSP device
+ * @rpf_index: index of the RPF to setup (0-based)
+ * @pixelformat: V4L2 pixel format for the RPF memory input
+ * @pitch: number of bytes per line in the image stored in memory
+ * @mem: DMA addresses of the memory buffers (one per plane)
+ * @src: the source crop rectangle for the RPF
+ * @dst: the destination compose rectangle for the BRU input
+ *
+ * Configure the VSP to perform composition of the image referenced by @mem
+ * through RPF @rpf_index, using the @src crop rectangle and the @dst
+ * composition rectangle. The Z-order is fixed with RPF 0 at the bottom.
+ *
+ * Image format as stored in memory is expressed as a V4L2 @pixelformat value.
+ * As a special case, setting the pixel format to 0 will disable the RPF. The
+ * @pitch, @mem, @src and @dst parameters are ignored in that case. Calling the
+ * function on a disabled RPF is allowed.
+ *
+ * The memory pitch is configurable to allow for padding at end of lines, or
+ * simple for images that extend beyond the crop rectangle boundaries. The
+ * @pitch value is expressed in bytes and applies to all planes for multiplanar
+ * formats.
+ *
+ * The source memory buffer is referenced by the DMA address of its planes in
+ * the @mem array. Up to two planes are supported. The second plane DMA address
+ * is ignored for formats using a single plane.
+ *
+ * This function isn't reentrant, the caller needs to serialize calls.
+ *
+ * TODO: Implement Z-order control by decoupling the RPF index from the BRU
+ * input index.
+ *
+ * Return 0 on success or a negative error code on failure.
+ */
+int vsp1_du_atomic_update(struct device *dev, unsigned int rpf_index,
+                          u32 pixelformat, unsigned int pitch,
+                          dma_addr_t mem[2], const struct v4l2_rect *src,
+                          const struct v4l2_rect *dst)
+{
+        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+        struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
+        const struct vsp1_format_info *fmtinfo;
+        struct v4l2_subdev_selection sel;
+        struct v4l2_subdev_format format;
+        struct vsp1_rwpf_memory memory;
+        struct vsp1_rwpf *rpf;
+        unsigned long flags;
+        int ret;
+
+        if (rpf_index >= vsp1->info->rpf_count)
+                return -EINVAL;
+
+        rpf = vsp1->rpf[rpf_index];
+
+        if (pixelformat == 0) {
+                dev_dbg(vsp1->dev, "%s: RPF%u: disable requested\n", __func__,
+                        rpf_index);
+
+                spin_lock_irqsave(&pipe->irqlock, flags);
+
+                if (pipe->inputs[rpf_index]) {
+                        /* Remove the RPF from the pipeline if it was previously
+                         * enabled.
+                         */
+                        vsp1->bru->inputs[rpf_index].rpf = NULL;
+                        pipe->inputs[rpf_index] = NULL;
+
+                        pipe->num_inputs--;
+                }
+
+                spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+                return 0;
+        }
+
+        dev_dbg(vsp1->dev,
+                "%s: RPF%u: (%u,%u)/%ux%u -> (%u,%u)/%ux%u (%08x), pitch %u dma { %pad, %pad }\n",
+                __func__, rpf_index,
+                src->left, src->top, src->width, src->height,
+                dst->left, dst->top, dst->width, dst->height,
+                pixelformat, pitch, &mem[0], &mem[1]);
+
+        /* Set the stride at the RPF input. */
+        fmtinfo = vsp1_get_format_info(pixelformat);
+        if (!fmtinfo) {
+                dev_dbg(vsp1->dev, "Unsupport pixel format %08x for RPF\n",
+                        pixelformat);
+                return -EINVAL;
+        }
+
+        rpf->fmtinfo = fmtinfo;
+        rpf->format.num_planes = fmtinfo->planes;
+        rpf->format.plane_fmt[0].bytesperline = pitch;
+        rpf->format.plane_fmt[1].bytesperline = pitch;
+
+        /* Configure the format on the RPF sink pad and propagate it up to the
+         * BRU sink pad.
+         */
+        memset(&format, 0, sizeof(format));
+        format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        format.pad = RWPF_PAD_SINK;
+        format.format.width = src->width + src->left;
+        format.format.height = src->height + src->top;
+        format.format.code = fmtinfo->mbus;
+        format.format.field = V4L2_FIELD_NONE;
+
+        ret = v4l2_subdev_call(&rpf->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev,
+                "%s: set format %ux%u (%x) on RPF%u sink\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code, rpf->entity.index);
+
+        memset(&sel, 0, sizeof(sel));
+        sel.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+        sel.pad = RWPF_PAD_SINK;
+        sel.target = V4L2_SEL_TGT_CROP;
+        sel.r = *src;
+
+        ret = v4l2_subdev_call(&rpf->entity.subdev, pad, set_selection, NULL,
+                               &sel);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev,
+                "%s: set selection (%u,%u)/%ux%u on RPF%u sink\n",
+                __func__, sel.r.left, sel.r.top, sel.r.width, sel.r.height,
+                rpf->entity.index);
+
+        /* RPF source, hardcode the format to ARGB8888 to turn on format
+         * conversion if needed.
+         */
+        format.pad = RWPF_PAD_SOURCE;
+
+        ret = v4l2_subdev_call(&rpf->entity.subdev, pad, get_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev,
+                "%s: got format %ux%u (%x) on RPF%u source\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code, rpf->entity.index);
+
+        format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;
+
+        ret = v4l2_subdev_call(&rpf->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        /* BRU sink, propagate the format from the RPF source. */
+        format.pad = rpf->entity.index;
+
+        ret = v4l2_subdev_call(&vsp1->bru->entity.subdev, pad, set_fmt, NULL,
+                               &format);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on BRU pad %u\n",
+                __func__, format.format.width, format.format.height,
+                format.format.code, format.pad);
+
+        sel.pad = rpf->entity.index;
+        sel.target = V4L2_SEL_TGT_COMPOSE;
+        sel.r = *dst;
+
+        ret = v4l2_subdev_call(&vsp1->bru->entity.subdev, pad, set_selection,
+                               NULL, &sel);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(vsp1->dev,
+                "%s: set selection (%u,%u)/%ux%u on BRU pad %u\n",
+                __func__, sel.r.left, sel.r.top, sel.r.width, sel.r.height,
+                sel.pad);
+
+        /* Store the compose rectangle coordinates in the RPF. */
+        rpf->location.left = dst->left;
+        rpf->location.top = dst->top;
+
+        /* Set the memory buffer address. */
+        memory.num_planes = fmtinfo->planes;
+        memory.addr[0] = mem[0];
+        memory.addr[1] = mem[1];
+
+        rpf->ops->set_memory(rpf, &memory);
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+
+        /* If the RPF was previously stopped set the BRU input to the RPF and
+         * store the RPF in the pipeline inputs array.
+         */
+        if (!pipe->inputs[rpf->entity.index]) {
+                vsp1->bru->inputs[rpf_index].rpf = rpf;
+                pipe->inputs[rpf->entity.index] = rpf;
+                pipe->num_inputs++;
+        }
+
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vsp1_du_atomic_update);
+
+/**
+ * vsp1_du_atomic_flush - Commit an atomic update
+ * @dev: the VSP device
+ */
+void vsp1_du_atomic_flush(struct device *dev)
+{
+        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+        struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
+        struct vsp1_entity *entity;
+        unsigned long flags;
+        bool stop = false;
+        int ret;
+
+        list_for_each_entry(entity, &pipe->entities, list_pipe) {
+                /* Disconnect unused RPFs from the pipeline. */
+                if (entity->type == VSP1_ENTITY_RPF) {
+                        struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev);
+
+                        if (!pipe->inputs[rpf->entity.index]) {
+                                vsp1_mod_write(entity, entity->route->reg,
+                                           VI6_DPR_NODE_UNUSED);
+                                continue;
+                        }
+                }
+
+                vsp1_entity_route_setup(entity);
+
+                ret = v4l2_subdev_call(&entity->subdev, video,
+                                       s_stream, 1);
+                if (ret < 0) {
+                        dev_err(vsp1->dev,
+                                "DRM pipeline start failure on entity %s\n",
+                                entity->subdev.name);
+                        return;
+                }
+        }
+
+        vsp1_dl_commit(vsp1->drm->dl);
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+
+        /* Start or stop the pipeline if needed. */
+        if (!vsp1->drm->num_inputs && pipe->num_inputs) {
+                vsp1_write(vsp1, VI6_DISP_IRQ_STA, 0);
+                vsp1_write(vsp1, VI6_DISP_IRQ_ENB, VI6_DISP_IRQ_ENB_DSTE);
+                vsp1_pipeline_run(pipe);
+        } else if (vsp1->drm->num_inputs && !pipe->num_inputs) {
+                stop = true;
+        }
+
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+        if (stop) {
+                vsp1_write(vsp1, VI6_DISP_IRQ_ENB, 0);
+                vsp1_pipeline_stop(pipe);
+        }
+}
+EXPORT_SYMBOL_GPL(vsp1_du_atomic_flush);
+
+/* -----------------------------------------------------------------------------
+ * Initialization
+ */
+
+int vsp1_drm_create_links(struct vsp1_device *vsp1)
+{
+        const u32 flags = MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE;
+        unsigned int i;
+        int ret;
+
+        /* VSPD instances require a BRU to perform composition and a LIF to
+         * output to the DU.
+         */
+        if (!vsp1->bru || !vsp1->lif)
+                return -ENXIO;
+
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
+                struct vsp1_rwpf *rpf = vsp1->rpf[i];
+
+                ret = media_create_pad_link(&rpf->entity.subdev.entity,
+                                            RWPF_PAD_SOURCE,
+                                            &vsp1->bru->entity.subdev.entity,
+                                            i, flags);
+                if (ret < 0)
+                        return ret;
+
+                rpf->entity.sink = &vsp1->bru->entity.subdev.entity;
+                rpf->entity.sink_pad = i;
+        }
+
+        ret = media_create_pad_link(&vsp1->bru->entity.subdev.entity,
+                                    vsp1->bru->entity.source_pad,
+                                    &vsp1->wpf[0]->entity.subdev.entity,
+                                    RWPF_PAD_SINK, flags);
+        if (ret < 0)
+                return ret;
+
+        vsp1->bru->entity.sink = &vsp1->wpf[0]->entity.subdev.entity;
+        vsp1->bru->entity.sink_pad = RWPF_PAD_SINK;
+
+        ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
+                                    RWPF_PAD_SOURCE,
+                                    &vsp1->lif->entity.subdev.entity,
+                                    LIF_PAD_SINK, flags);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+int vsp1_drm_init(struct vsp1_device *vsp1)
+{
+        struct vsp1_pipeline *pipe;
+        unsigned int i;
+
+        vsp1->drm = devm_kzalloc(vsp1->dev, sizeof(*vsp1->drm), GFP_KERNEL);
+        if (!vsp1->drm)
+                return -ENOMEM;
+
+        vsp1->drm->dl = vsp1_dl_create(vsp1);
+        if (!vsp1->drm->dl)
+                return -ENOMEM;
+
+        pipe = &vsp1->drm->pipe;
+
+        vsp1_pipeline_init(pipe);
+        pipe->frame_end = vsp1_drm_pipeline_frame_end;
+
+        /* The DRM pipeline is static, add entities manually. */
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
+                struct vsp1_rwpf *input = vsp1->rpf[i];
+
+                list_add_tail(&input->entity.list_pipe, &pipe->entities);
+        }
+
+        list_add_tail(&vsp1->bru->entity.list_pipe, &pipe->entities);
+        list_add_tail(&vsp1->wpf[0]->entity.list_pipe, &pipe->entities);
+        list_add_tail(&vsp1->lif->entity.list_pipe, &pipe->entities);
+
+        pipe->bru = &vsp1->bru->entity;
+        pipe->lif = &vsp1->lif->entity;
+        pipe->output = vsp1->wpf[0];
+
+        pipe->dl = vsp1->drm->dl;
+
+        return 0;
+}
+
+void vsp1_drm_cleanup(struct vsp1_device *vsp1)
+{
+        vsp1_dl_destroy(vsp1->drm->dl);
+}
diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platform/vsp1/vsp1_drm.h
new file mode 100644
index 000000000000..f68056838319
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_drm.h
@@ -0,0 +1,49 @@
+/*
+ * vsp1_drm.h  --  R-Car VSP1 DRM/KMS Interface
+ *
+ * Copyright (C) 2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __VSP1_DRM_H__
+#define __VSP1_DRM_H__
+
+#include "vsp1_pipe.h"
+
+struct vsp1_dl;
+
+/**
+ * vsp1_drm - State for the API exposed to the DRM driver
+ * @dl: display list for DRM pipeline operation
+ * @pipe: the VSP1 pipeline used for display
+ * @num_inputs: number of active pipeline inputs at the beginning of an update
+ * @update: the pipeline configuration has been updated
+ */
+struct vsp1_drm {
+        struct vsp1_dl *dl;
+        struct vsp1_pipeline pipe;
+        unsigned int num_inputs;
+        bool update;
+};
+
+int vsp1_drm_init(struct vsp1_device *vsp1);
+void vsp1_drm_cleanup(struct vsp1_device *vsp1);
+int vsp1_drm_create_links(struct vsp1_device *vsp1);
+
+int vsp1_du_init(struct device *dev);
+int vsp1_du_setup_lif(struct device *dev, unsigned int width,
+                      unsigned int height);
+void vsp1_du_atomic_begin(struct device *dev);
+int vsp1_du_atomic_update(struct device *dev, unsigned int rpf_index,
+                          u32 pixelformat, unsigned int pitch,
+                          dma_addr_t mem[2], const struct v4l2_rect *src,
+                          const struct v4l2_rect *dst);
+void vsp1_du_atomic_flush(struct device *dev);
+
+
+#endif /* __VSP1_DRM_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index 533bc796391e..25750a0e4631 100644
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -17,17 +17,23 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/videodev2.h>
 
+#include <media/v4l2-subdev.h>
+
 #include "vsp1.h"
 #include "vsp1_bru.h"
+#include "vsp1_dl.h"
+#include "vsp1_drm.h"
 #include "vsp1_hsit.h"
 #include "vsp1_lif.h"
 #include "vsp1_lut.h"
 #include "vsp1_rwpf.h"
 #include "vsp1_sru.h"
 #include "vsp1_uds.h"
+#include "vsp1_video.h"
 
 /* -----------------------------------------------------------------------------
  * Interrupt Handling
@@ -39,11 +45,11 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
         struct vsp1_device *vsp1 = data;
         irqreturn_t ret = IRQ_NONE;
         unsigned int i;
+        u32 status;
 
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
                 struct vsp1_rwpf *wpf = vsp1->wpf[i];
                 struct vsp1_pipeline *pipe;
-                u32 status;
 
                 if (wpf == NULL)
                         continue;
@@ -58,6 +64,21 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
                 }
         }
 
+        status = vsp1_read(vsp1, VI6_DISP_IRQ_STA);
+        vsp1_write(vsp1, VI6_DISP_IRQ_STA, ~status & VI6_DISP_IRQ_STA_DST);
+
+        if (status & VI6_DISP_IRQ_STA_DST) {
+                struct vsp1_rwpf *wpf = vsp1->wpf[0];
+                struct vsp1_pipeline *pipe;
+
+                if (wpf) {
+                        pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
+                        vsp1_pipeline_display_start(pipe);
+                }
+
+                ret = IRQ_HANDLED;
+        }
+
         return ret;
 }
 
@@ -66,7 +87,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
  */
 
 /*
- * vsp1_create_links - Create links from all sources to the given sink
+ * vsp1_create_sink_links - Create links from all sources to the given sink
  *
  * This function creates media links from all valid sources to the given sink
  * pad. Links that would be invalid according to the VSP1 hardware capabilities
@@ -75,7 +96,8 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
  * - from a UDS to a UDS (UDS entities can't be chained)
  * - from an entity to itself (no loops are allowed)
  */
-static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
+static int vsp1_create_sink_links(struct vsp1_device *vsp1,
+                                  struct vsp1_entity *sink)
 {
         struct media_entity *entity = &sink->subdev.entity;
         struct vsp1_entity *source;
@@ -115,19 +137,86 @@ static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
         return 0;
 }
 
-static void vsp1_destroy_entities(struct vsp1_device *vsp1)
+static int vsp1_uapi_create_links(struct vsp1_device *vsp1)
 {
         struct vsp1_entity *entity;
-        struct vsp1_entity *next;
+        unsigned int i;
+        int ret;
+
+        list_for_each_entry(entity, &vsp1->entities, list_dev) {
+                if (entity->type == VSP1_ENTITY_LIF ||
+                    entity->type == VSP1_ENTITY_RPF)
+                        continue;
+
+                ret = vsp1_create_sink_links(vsp1, entity);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (vsp1->info->features & VSP1_HAS_LIF) {
+                ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
+                                            RWPF_PAD_SOURCE,
+                                            &vsp1->lif->entity.subdev.entity,
+                                            LIF_PAD_SINK, 0);
+                if (ret < 0)
+                        return ret;
+        }
+
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
+                struct vsp1_rwpf *rpf = vsp1->rpf[i];
 
-        list_for_each_entry_safe(entity, next, &vsp1->entities, list_dev) {
+                ret = media_create_pad_link(&rpf->video->video.entity, 0,
+                                            &rpf->entity.subdev.entity,
+                                            RWPF_PAD_SINK,
+                                            MEDIA_LNK_FL_ENABLED |
+                                            MEDIA_LNK_FL_IMMUTABLE);
+                if (ret < 0)
+                        return ret;
+        }
+
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
+                /* Connect the video device to the WPF. All connections are
+                 * immutable except for the WPF0 source link if a LIF is
+                 * present.
+                 */
+                struct vsp1_rwpf *wpf = vsp1->wpf[i];
+                unsigned int flags = MEDIA_LNK_FL_ENABLED;
+
+                if (!(vsp1->info->features & VSP1_HAS_LIF) || i != 0)
+                        flags |= MEDIA_LNK_FL_IMMUTABLE;
+
+                ret = media_create_pad_link(&wpf->entity.subdev.entity,
+                                            RWPF_PAD_SOURCE,
+                                            &wpf->video->video.entity, 0,
+                                            flags);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static void vsp1_destroy_entities(struct vsp1_device *vsp1)
+{
+        struct vsp1_entity *entity, *_entity;
+        struct vsp1_video *video, *_video;
+
+        list_for_each_entry_safe(entity, _entity, &vsp1->entities, list_dev) {
                 list_del(&entity->list_dev);
                 vsp1_entity_destroy(entity);
         }
 
+        list_for_each_entry_safe(video, _video, &vsp1->videos, list) {
+                list_del(&video->list);
+                vsp1_video_cleanup(video);
+        }
+
         v4l2_device_unregister(&vsp1->v4l2_dev);
         media_device_unregister(&vsp1->media_dev);
         media_device_cleanup(&vsp1->media_dev);
+
+        if (!vsp1->info->uapi)
+                vsp1_drm_cleanup(vsp1);
 }
 
 static int vsp1_create_entities(struct vsp1_device *vsp1)
@@ -144,6 +233,14 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
                  dev_name(mdev->dev));
         media_device_init(mdev);
 
+        vsp1->media_ops.link_setup = vsp1_entity_link_setup;
+        /* Don't perform link validation when the userspace API is disabled as
+         * the pipeline is configured internally by the driver in that case, and
+         * its configuration can thus be trusted.
+         */
+        if (vsp1->info->uapi)
+                vsp1->media_ops.link_validate = v4l2_subdev_link_validate;
+
         vdev->mdev = mdev;
         ret = v4l2_device_register(vsp1->dev, vdev);
         if (ret < 0) {
@@ -153,13 +250,15 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
         }
 
         /* Instantiate all the entities. */
-        vsp1->bru = vsp1_bru_create(vsp1);
-        if (IS_ERR(vsp1->bru)) {
-                ret = PTR_ERR(vsp1->bru);
-                goto done;
-        }
+        if (vsp1->info->features & VSP1_HAS_BRU) {
+                vsp1->bru = vsp1_bru_create(vsp1);
+                if (IS_ERR(vsp1->bru)) {
+                        ret = PTR_ERR(vsp1->bru);
+                        goto done;
+                }
 
-        list_add_tail(&vsp1->bru->entity.list_dev, &vsp1->entities);
+                list_add_tail(&vsp1->bru->entity.list_dev, &vsp1->entities);
+        }
 
         vsp1->hsi = vsp1_hsit_create(vsp1, true);
         if (IS_ERR(vsp1->hsi)) {
@@ -177,7 +276,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
 
         list_add_tail(&vsp1->hst->entity.list_dev, &vsp1->entities);
 
-        if (vsp1->pdata.features & VSP1_HAS_LIF) {
+        if (vsp1->info->features & VSP1_HAS_LIF) {
                 vsp1->lif = vsp1_lif_create(vsp1);
                 if (IS_ERR(vsp1->lif)) {
                         ret = PTR_ERR(vsp1->lif);
@@ -187,7 +286,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
                 list_add_tail(&vsp1->lif->entity.list_dev, &vsp1->entities);
         }
 
-        if (vsp1->pdata.features & VSP1_HAS_LUT) {
+        if (vsp1->info->features & VSP1_HAS_LUT) {
                 vsp1->lut = vsp1_lut_create(vsp1);
                 if (IS_ERR(vsp1->lut)) {
                         ret = PTR_ERR(vsp1->lut);
@@ -197,7 +296,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
                 list_add_tail(&vsp1->lut->entity.list_dev, &vsp1->entities);
         }
 
-        for (i = 0; i < vsp1->pdata.rpf_count; ++i) {
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
                 struct vsp1_rwpf *rpf;
 
                 rpf = vsp1_rpf_create(vsp1, i);
@@ -208,9 +307,20 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
 
                 vsp1->rpf[i] = rpf;
                 list_add_tail(&rpf->entity.list_dev, &vsp1->entities);
+
+                if (vsp1->info->uapi) {
+                        struct vsp1_video *video = vsp1_video_create(vsp1, rpf);
+
+                        if (IS_ERR(video)) {
+                                ret = PTR_ERR(video);
+                                goto done;
+                        }
+
+                        list_add_tail(&video->list, &vsp1->videos);
+                }
         }
 
-        if (vsp1->pdata.features & VSP1_HAS_SRU) {
+        if (vsp1->info->features & VSP1_HAS_SRU) {
                 vsp1->sru = vsp1_sru_create(vsp1);
                 if (IS_ERR(vsp1->sru)) {
                         ret = PTR_ERR(vsp1->sru);
@@ -220,7 +330,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
                 list_add_tail(&vsp1->sru->entity.list_dev, &vsp1->entities);
         }
 
-        for (i = 0; i < vsp1->pdata.uds_count; ++i) {
+        for (i = 0; i < vsp1->info->uds_count; ++i) {
                 struct vsp1_uds *uds;
 
                 uds = vsp1_uds_create(vsp1, i);
@@ -233,7 +343,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
                 list_add_tail(&uds->entity.list_dev, &vsp1->entities);
         }
 
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
                 struct vsp1_rwpf *wpf;
 
                 wpf = vsp1_wpf_create(vsp1, i);
@@ -244,6 +354,18 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
 
                 vsp1->wpf[i] = wpf;
                 list_add_tail(&wpf->entity.list_dev, &vsp1->entities);
+
+                if (vsp1->info->uapi) {
+                        struct vsp1_video *video = vsp1_video_create(vsp1, wpf);
+
+                        if (IS_ERR(video)) {
+                                ret = PTR_ERR(video);
+                                goto done;
+                        }
+
+                        list_add_tail(&video->list, &vsp1->videos);
+                        wpf->entity.sink = &video->video.entity;
+                }
         }
 
         /* Register all subdevs. */
@@ -255,34 +377,23 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
         }
 
         /* Create links. */
-        list_for_each_entry(entity, &vsp1->entities, list_dev) {
-                if (entity->type == VSP1_ENTITY_WPF) {
-                        ret = vsp1_wpf_create_links(vsp1, entity);
-                        if (ret < 0)
-                                goto done;
-                } else if (entity->type == VSP1_ENTITY_RPF) {
-                        ret = vsp1_rpf_create_links(vsp1, entity);
-                        if (ret < 0)
-                                goto done;
-                }
-
-                if (entity->type != VSP1_ENTITY_LIF &&
-                    entity->type != VSP1_ENTITY_RPF) {
-                        ret = vsp1_create_links(vsp1, entity);
-                        if (ret < 0)
-                                goto done;
-                }
-        }
+        if (vsp1->info->uapi)
+                ret = vsp1_uapi_create_links(vsp1);
+        else
+                ret = vsp1_drm_create_links(vsp1);
+        if (ret < 0)
+                goto done;
 
-        if (vsp1->pdata.features & VSP1_HAS_LIF) {
-                ret = media_create_pad_link(
-                        &vsp1->wpf[0]->entity.subdev.entity, RWPF_PAD_SOURCE,
-                        &vsp1->lif->entity.subdev.entity, LIF_PAD_SINK, 0);
-                if (ret < 0)
-                        return ret;
+        /* Register subdev nodes if the userspace API is enabled or initialize
+         * the DRM pipeline otherwise.
+         */
+        if (vsp1->info->uapi) {
+                vsp1->use_dl = false;
+                ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);
+        } else {
+                vsp1->use_dl = true;
+                ret = vsp1_drm_init(vsp1);
         }
-
-        ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);
         if (ret < 0)
                 goto done;
 
@@ -295,42 +406,51 @@ done:
         return ret;
 }
 
-static int vsp1_device_init(struct vsp1_device *vsp1)
+int vsp1_reset_wpf(struct vsp1_device *vsp1, unsigned int index)
 {
-        unsigned int i;
+        unsigned int timeout;
         u32 status;
 
-        /* Reset any channel that might be running. */
         status = vsp1_read(vsp1, VI6_STATUS);
+        if (!(status & VI6_STATUS_SYS_ACT(index)))
+                return 0;
 
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
-                unsigned int timeout;
+        vsp1_write(vsp1, VI6_SRESET, VI6_SRESET_SRTS(index));
+        for (timeout = 10; timeout > 0; --timeout) {
+                status = vsp1_read(vsp1, VI6_STATUS);
+                if (!(status & VI6_STATUS_SYS_ACT(index)))
+                        break;
 
-                if (!(status & VI6_STATUS_SYS_ACT(i)))
-                        continue;
+                usleep_range(1000, 2000);
+        }
 
-                vsp1_write(vsp1, VI6_SRESET, VI6_SRESET_SRTS(i));
-                for (timeout = 10; timeout > 0; --timeout) {
-                        status = vsp1_read(vsp1, VI6_STATUS);
-                        if (!(status & VI6_STATUS_SYS_ACT(i)))
-                                break;
+        if (!timeout) {
+                dev_err(vsp1->dev, "failed to reset wpf.%u\n", index);
+                return -ETIMEDOUT;
+        }
 
-                        usleep_range(1000, 2000);
-                }
+        return 0;
+}
 
-                if (!timeout) {
-                        dev_err(vsp1->dev, "failed to reset wpf.%u\n", i);
-                        return -ETIMEDOUT;
-                }
+static int vsp1_device_init(struct vsp1_device *vsp1)
+{
+        unsigned int i;
+        int ret;
+
+        /* Reset any channel that might be running. */
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
+                ret = vsp1_reset_wpf(vsp1, i);
+                if (ret < 0)
+                        return ret;
         }
 
         vsp1_write(vsp1, VI6_CLK_DCSWT, (8 << VI6_CLK_DCSWT_CSTPW_SHIFT) |
                    (8 << VI6_CLK_DCSWT_CSTRW_SHIFT));
 
-        for (i = 0; i < vsp1->pdata.rpf_count; ++i)
+        for (i = 0; i < vsp1->info->rpf_count; ++i)
                 vsp1_write(vsp1, VI6_DPR_RPF_ROUTE(i), VI6_DPR_NODE_UNUSED);
 
-        for (i = 0; i < vsp1->pdata.uds_count; ++i)
+        for (i = 0; i < vsp1->info->uds_count; ++i)
                 vsp1_write(vsp1, VI6_DPR_UDS_ROUTE(i), VI6_DPR_NODE_UNUSED);
 
         vsp1_write(vsp1, VI6_DPR_SRU_ROUTE, VI6_DPR_NODE_UNUSED);
@@ -345,6 +465,9 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
         vsp1_write(vsp1, VI6_DPR_HGT_SMPPT, (7 << VI6_DPR_SMPPT_TGW_SHIFT) |
                    (VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT));
 
+        if (vsp1->use_dl)
+                vsp1_dl_setup(vsp1);
+
         return 0;
 }
 
@@ -444,48 +567,76 @@ static const struct dev_pm_ops vsp1_pm_ops = {
  * Platform Driver
  */
 
-static int vsp1_parse_dt(struct vsp1_device *vsp1)
-{
-        struct device_node *np = vsp1->dev->of_node;
-        struct vsp1_platform_data *pdata = &vsp1->pdata;
-
-        if (of_property_read_bool(np, "renesas,has-lif"))
-                pdata->features |= VSP1_HAS_LIF;
-        if (of_property_read_bool(np, "renesas,has-lut"))
-                pdata->features |= VSP1_HAS_LUT;
-        if (of_property_read_bool(np, "renesas,has-sru"))
-                pdata->features |= VSP1_HAS_SRU;
-
-        of_property_read_u32(np, "renesas,#rpf", &pdata->rpf_count);
-        of_property_read_u32(np, "renesas,#uds", &pdata->uds_count);
-        of_property_read_u32(np, "renesas,#wpf", &pdata->wpf_count);
-
-        if (pdata->rpf_count <= 0 || pdata->rpf_count > VSP1_MAX_RPF) {
-                dev_err(vsp1->dev, "invalid number of RPF (%u)\n",
-                        pdata->rpf_count);
-                return -EINVAL;
-        }
-
-        if (pdata->uds_count <= 0 || pdata->uds_count > VSP1_MAX_UDS) {
-                dev_err(vsp1->dev, "invalid number of UDS (%u)\n",
-                        pdata->uds_count);
-                return -EINVAL;
-        }
-
-        if (pdata->wpf_count <= 0 || pdata->wpf_count > VSP1_MAX_WPF) {
-                dev_err(vsp1->dev, "invalid number of WPF (%u)\n",
-                        pdata->wpf_count);
-                return -EINVAL;
-        }
-
-        return 0;
-}
+static const struct vsp1_device_info vsp1_device_infos[] = {
+        {
+                .version = VI6_IP_VERSION_MODEL_VSPS_H2,
+                .features = VSP1_HAS_BRU | VSP1_HAS_LUT | VSP1_HAS_SRU,
+                .rpf_count = 5,
+                .uds_count = 3,
+                .wpf_count = 4,
+                .num_bru_inputs = 4,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPR_H2,
+                .features = VSP1_HAS_BRU | VSP1_HAS_SRU,
+                .rpf_count = 5,
+                .uds_count = 1,
+                .wpf_count = 4,
+                .num_bru_inputs = 4,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPD_GEN2,
+                .features = VSP1_HAS_BRU | VSP1_HAS_LIF | VSP1_HAS_LUT,
+                .rpf_count = 4,
+                .uds_count = 1,
+                .wpf_count = 4,
+                .num_bru_inputs = 4,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPS_M2,
+                .features = VSP1_HAS_BRU | VSP1_HAS_LUT | VSP1_HAS_SRU,
+                .rpf_count = 5,
+                .uds_count = 3,
+                .wpf_count = 4,
+                .num_bru_inputs = 4,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPI_GEN3,
+                .features = VSP1_HAS_LUT | VSP1_HAS_SRU,
+                .rpf_count = 1,
+                .uds_count = 1,
+                .wpf_count = 1,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPBD_GEN3,
+                .features = VSP1_HAS_BRU,
+                .rpf_count = 5,
+                .wpf_count = 1,
+                .num_bru_inputs = 5,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPBC_GEN3,
+                .features = VSP1_HAS_BRU | VSP1_HAS_LUT,
+                .rpf_count = 5,
+                .wpf_count = 1,
+                .num_bru_inputs = 5,
+                .uapi = true,
+        }, {
+                .version = VI6_IP_VERSION_MODEL_VSPD_GEN3,
+                .features = VSP1_HAS_BRU | VSP1_HAS_LIF | VSP1_HAS_LUT,
+                .rpf_count = 5,
+                .wpf_count = 2,
+                .num_bru_inputs = 5,
+        },
+};
 
 static int vsp1_probe(struct platform_device *pdev)
 {
         struct vsp1_device *vsp1;
         struct resource *irq;
         struct resource *io;
+        unsigned int i;
+        u32 version;
         int ret;
 
         vsp1 = devm_kzalloc(&pdev->dev, sizeof(*vsp1), GFP_KERNEL);
@@ -495,10 +646,7 @@ static int vsp1_probe(struct platform_device *pdev)
         vsp1->dev = &pdev->dev;
         mutex_init(&vsp1->lock);
         INIT_LIST_HEAD(&vsp1->entities);
-
-        ret = vsp1_parse_dt(vsp1);
-        if (ret < 0)
-                return ret;
+        INIT_LIST_HEAD(&vsp1->videos);
 
         /* I/O, IRQ and clock resources */
         io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -525,6 +673,29 @@ static int vsp1_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        /* Configure device parameters based on the version register. */
+        ret = clk_prepare_enable(vsp1->clock);
+        if (ret < 0)
+                return ret;
+
+        version = vsp1_read(vsp1, VI6_IP_VERSION);
+        clk_disable_unprepare(vsp1->clock);
+
+        for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) {
+                if ((version & VI6_IP_VERSION_MODEL_MASK) ==
+                    vsp1_device_infos[i].version) {
+                        vsp1->info = &vsp1_device_infos[i];
+                        break;
+                }
+        }
+
+        if (!vsp1->info) {
+                dev_err(&pdev->dev, "unsupported IP version 0x%08x\n", version);
+                return -ENXIO;
+        }
+
+        dev_dbg(&pdev->dev, "IP version 0x%08x\n", version);
+
         /* Instanciate entities */
         ret = vsp1_create_entities(vsp1);
         if (ret < 0) {
@@ -548,6 +719,7 @@ static int vsp1_remove(struct platform_device *pdev)
 
 static const struct of_device_id vsp1_of_match[] = {
         { .compatible = "renesas,vsp1" },
+        { .compatible = "renesas,vsp2" },
         { },
 };
 
diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
index d7308530952f..20a78fbd3691 100644
--- a/drivers/media/platform/vsp1/vsp1_entity.c
+++ b/drivers/media/platform/vsp1/vsp1_entity.c
@@ -20,7 +20,6 @@
 
 #include "vsp1.h"
 #include "vsp1_entity.h"
-#include "vsp1_video.h"
 
 bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
 {
@@ -46,7 +45,7 @@ int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
         if (!streaming)
                 return 0;
 
-        if (!entity->subdev.ctrl_handler)
+        if (!entity->vsp1->info->uapi || !entity->subdev.ctrl_handler)
                 return 0;
 
         ret = v4l2_ctrl_handler_setup(entity->subdev.ctrl_handler);
@@ -59,6 +58,18 @@ int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
         return ret;
 }
 
+void vsp1_entity_route_setup(struct vsp1_entity *source)
+{
+        struct vsp1_entity *sink;
+
+        if (source->route->reg == 0)
+                return;
+
+        sink = container_of(source->sink, struct vsp1_entity, subdev.entity);
+        vsp1_mod_write(source, source->route->reg,
+                       sink->route->inputs[source->sink_pad]);
+}
+
 /* -----------------------------------------------------------------------------
  * V4L2 Subdevice Operations
  */
@@ -120,9 +131,9 @@ const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops = {
  * Media Operations
  */
 
-static int vsp1_entity_link_setup(struct media_entity *entity,
-                                  const struct media_pad *local,
-                                  const struct media_pad *remote, u32 flags)
+int vsp1_entity_link_setup(struct media_entity *entity,
+                           const struct media_pad *local,
+                           const struct media_pad *remote, u32 flags)
 {
         struct vsp1_entity *source;
 
@@ -147,11 +158,6 @@ static int vsp1_entity_link_setup(struct media_entity *entity,
         return 0;
 }
 
-const struct media_entity_operations vsp1_media_ops = {
-        .link_setup = vsp1_entity_link_setup,
-        .link_validate = v4l2_subdev_link_validate,
-};
-
 /* -----------------------------------------------------------------------------
  * Initialization
  */
@@ -159,7 +165,8 @@ const struct media_entity_operations vsp1_media_ops = {
 static const struct vsp1_route vsp1_routes[] = {
         { VSP1_ENTITY_BRU, 0, VI6_DPR_BRU_ROUTE,
           { VI6_DPR_NODE_BRU_IN(0), VI6_DPR_NODE_BRU_IN(1),
-            VI6_DPR_NODE_BRU_IN(2), VI6_DPR_NODE_BRU_IN(3), } },
+            VI6_DPR_NODE_BRU_IN(2), VI6_DPR_NODE_BRU_IN(3),
+            VI6_DPR_NODE_BRU_IN(4) } },
         { VSP1_ENTITY_HSI, 0, VI6_DPR_HSI_ROUTE, { VI6_DPR_NODE_HSI, } },
         { VSP1_ENTITY_HST, 0, VI6_DPR_HST_ROUTE, { VI6_DPR_NODE_HST, } },
         { VSP1_ENTITY_LIF, 0, 0, { VI6_DPR_NODE_LIF, } },
@@ -225,8 +232,6 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
 
 void vsp1_entity_destroy(struct vsp1_entity *entity)
 {
-        if (entity->video)
-                vsp1_video_cleanup(entity->video);
         if (entity->subdev.ctrl_handler)
                 v4l2_ctrl_handler_free(entity->subdev.ctrl_handler);
         media_entity_cleanup(&entity->subdev.entity);
diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/platform/vsp1/vsp1_entity.h
index 8867a5787c28..83570dfde8ec 100644
--- a/drivers/media/platform/vsp1/vsp1_entity.h
+++ b/drivers/media/platform/vsp1/vsp1_entity.h
@@ -19,7 +19,6 @@
 #include <media/v4l2-subdev.h>
 
 struct vsp1_device;
-struct vsp1_video;
 
 enum vsp1_entity_type {
         VSP1_ENTITY_BRU,
@@ -33,6 +32,8 @@ enum vsp1_entity_type {
         VSP1_ENTITY_WPF,
 };
 
+#define VSP1_ENTITY_MAX_INPUTS          5       /* For the BRU */
+
 /*
  * struct vsp1_route - Entity routing configuration
  * @type: Entity type this routing entry is associated with
@@ -49,7 +50,7 @@ struct vsp1_route {
         enum vsp1_entity_type type;
         unsigned int index;
         unsigned int reg;
-        unsigned int inputs[4];
+        unsigned int inputs[VSP1_ENTITY_MAX_INPUTS];
 };
 
 struct vsp1_entity {
@@ -71,8 +72,6 @@ struct vsp1_entity {
         struct v4l2_subdev subdev;
         struct v4l2_mbus_framefmt *formats;
 
-        struct vsp1_video *video;
-
         spinlock_t lock;                /* Protects the streaming field */
         bool streaming;
 };
@@ -87,7 +86,10 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
 void vsp1_entity_destroy(struct vsp1_entity *entity);
 
 extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;
-extern const struct media_entity_operations vsp1_media_ops;
+
+int vsp1_entity_link_setup(struct media_entity *entity,
+                           const struct media_pad *local,
+                           const struct media_pad *remote, u32 flags);
 
 struct v4l2_mbus_framefmt *
 vsp1_entity_get_pad_format(struct vsp1_entity *entity,
@@ -99,4 +101,6 @@ void vsp1_entity_init_formats(struct v4l2_subdev *subdev,
 bool vsp1_entity_is_streaming(struct vsp1_entity *entity);
 int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming);
 
+void vsp1_entity_route_setup(struct vsp1_entity *source);
+
 #endif /* __VSP1_ENTITY_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platform/vsp1/vsp1_hsit.c
index 8ffb817ae525..c1087cff31a0 100644
--- a/drivers/media/platform/vsp1/vsp1_hsit.c
+++ b/drivers/media/platform/vsp1/vsp1_hsit.c
@@ -203,7 +203,7 @@ struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse)
         subdev = &hsit->entity.subdev;
         v4l2_subdev_init(subdev, &hsit_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s %s",
                  dev_name(vsp1->dev), inverse ? "hsi" : "hst");
diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index 39fa5ef20fbb..433853ce8dbf 100644
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -26,14 +26,9 @@
  * Device Access
  */
 
-static inline u32 vsp1_lif_read(struct vsp1_lif *lif, u32 reg)
-{
-        return vsp1_read(lif->entity.vsp1, reg);
-}
-
 static inline void vsp1_lif_write(struct vsp1_lif *lif, u32 reg, u32 data)
 {
-        vsp1_write(lif->entity.vsp1, reg, data);
+        vsp1_mod_write(&lif->entity, reg, data);
 }
 
 /* -----------------------------------------------------------------------------
@@ -49,7 +44,7 @@ static int lif_s_stream(struct v4l2_subdev *subdev, int enable)
         unsigned int lbth = 200;
 
         if (!enable) {
-                vsp1_lif_write(lif, VI6_LIF_CTRL, 0);
+                vsp1_write(lif->entity.vsp1, VI6_LIF_CTRL, 0);
                 return 0;
         }
 
@@ -228,7 +223,7 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)
         subdev = &lif->entity.subdev;
         v4l2_subdev_init(subdev, &lif_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s lif",
                  dev_name(vsp1->dev));
diff --git a/drivers/media/platform/vsp1/vsp1_lut.c b/drivers/media/platform/vsp1/vsp1_lut.c
index 656ec272a414..4b89095e7b5f 100644
--- a/drivers/media/platform/vsp1/vsp1_lut.c
+++ b/drivers/media/platform/vsp1/vsp1_lut.c
@@ -27,11 +27,6 @@
  * Device Access
  */
 
-static inline u32 vsp1_lut_read(struct vsp1_lut *lut, u32 reg)
-{
-        return vsp1_read(lut->entity.vsp1, reg);
-}
-
 static inline void vsp1_lut_write(struct vsp1_lut *lut, u32 reg, u32 data)
 {
         vsp1_write(lut->entity.vsp1, reg, data);
@@ -242,7 +237,7 @@ struct vsp1_lut *vsp1_lut_create(struct vsp1_device *vsp1)
         subdev = &lut->entity.subdev;
         v4l2_subdev_init(subdev, &lut_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s lut",
                  dev_name(vsp1->dev));
diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
new file mode 100644
index 000000000000..6659f06b1643
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_pipe.c
@@ -0,0 +1,426 @@
+/*
+ * vsp1_pipe.c  --  R-Car VSP1 Pipeline
+ *
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/delay.h>
+#include <linux/list.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+
+#include <media/media-entity.h>
+#include <media/v4l2-subdev.h>
+
+#include "vsp1.h"
+#include "vsp1_bru.h"
+#include "vsp1_dl.h"
+#include "vsp1_entity.h"
+#include "vsp1_pipe.h"
+#include "vsp1_rwpf.h"
+#include "vsp1_uds.h"
+
+/* -----------------------------------------------------------------------------
+ * Helper Functions
+ */
+
+static const struct vsp1_format_info vsp1_video_formats[] = {
+        { V4L2_PIX_FMT_RGB332, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_RGB_332, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 8, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_ARGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS,
+          1, { 16, 0, 0 }, false, false, 1, 1, true },
+        { V4L2_PIX_FMT_XRGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_XRGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS,
+          1, { 16, 0, 0 }, false, false, 1, 1, true },
+        { V4L2_PIX_FMT_ARGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS,
+          1, { 16, 0, 0 }, false, false, 1, 1, true },
+        { V4L2_PIX_FMT_XRGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_XRGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS,
+          1, { 16, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_RGB565, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_RGB_565, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS,
+          1, { 16, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_BGR24, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_BGR_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 24, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_RGB24, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_RGB_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 24, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_ABGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+          1, { 32, 0, 0 }, false, false, 1, 1, true },
+        { V4L2_PIX_FMT_XBGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+          1, { 32, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 32, 0, 0 }, false, false, 1, 1, true },
+        { V4L2_PIX_FMT_XRGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
+          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 32, 0, 0 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_UYVY, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 16, 0, 0 }, false, false, 2, 1, false },
+        { V4L2_PIX_FMT_VYUY, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 16, 0, 0 }, false, true, 2, 1, false },
+        { V4L2_PIX_FMT_YUYV, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 16, 0, 0 }, true, false, 2, 1, false },
+        { V4L2_PIX_FMT_YVYU, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          1, { 16, 0, 0 }, true, true, 2, 1, false },
+        { V4L2_PIX_FMT_NV12M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          2, { 8, 16, 0 }, false, false, 2, 2, false },
+        { V4L2_PIX_FMT_NV21M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          2, { 8, 16, 0 }, false, true, 2, 2, false },
+        { V4L2_PIX_FMT_NV16M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          2, { 8, 16, 0 }, false, false, 2, 1, false },
+        { V4L2_PIX_FMT_NV61M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          2, { 8, 16, 0 }, false, true, 2, 1, false },
+        { V4L2_PIX_FMT_YUV420M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, false, 2, 2, false },
+        { V4L2_PIX_FMT_YVU420M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, true, 2, 2, false },
+        { V4L2_PIX_FMT_YUV422M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, false, 2, 1, false },
+        { V4L2_PIX_FMT_YVU422M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, true, 2, 1, false },
+        { V4L2_PIX_FMT_YUV444M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, false, 1, 1, false },
+        { V4L2_PIX_FMT_YVU444M, MEDIA_BUS_FMT_AYUV8_1X32,
+          VI6_FMT_Y_U_V_444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
+          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
+          3, { 8, 8, 8 }, false, true, 1, 1, false },
+};
+
+/*
+ * vsp1_get_format_info - Retrieve format information for a 4CC
+ * @fourcc: the format 4CC
+ *
+ * Return a pointer to the format information structure corresponding to the
+ * given V4L2 format 4CC, or NULL if no corresponding format can be found.
+ */
+const struct vsp1_format_info *vsp1_get_format_info(u32 fourcc)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(vsp1_video_formats); ++i) {
+                const struct vsp1_format_info *info = &vsp1_video_formats[i];
+
+                if (info->fourcc == fourcc)
+                        return info;
+        }
+
+        return NULL;
+}
+
+/* -----------------------------------------------------------------------------
+ * Pipeline Management
+ */
+
+void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)
+{
+        unsigned int i;
+
+        if (pipe->bru) {
+                struct vsp1_bru *bru = to_bru(&pipe->bru->subdev);
+
+                for (i = 0; i < ARRAY_SIZE(bru->inputs); ++i)
+                        bru->inputs[i].rpf = NULL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i)
+                pipe->inputs[i] = NULL;
+
+        INIT_LIST_HEAD(&pipe->entities);
+        pipe->state = VSP1_PIPELINE_STOPPED;
+        pipe->buffers_ready = 0;
+        pipe->num_inputs = 0;
+        pipe->output = NULL;
+        pipe->bru = NULL;
+        pipe->lif = NULL;
+        pipe->uds = NULL;
+}
+
+void vsp1_pipeline_init(struct vsp1_pipeline *pipe)
+{
+        mutex_init(&pipe->lock);
+        spin_lock_init(&pipe->irqlock);
+        init_waitqueue_head(&pipe->wq);
+
+        INIT_LIST_HEAD(&pipe->entities);
+        pipe->state = VSP1_PIPELINE_STOPPED;
+}
+
+void vsp1_pipeline_run(struct vsp1_pipeline *pipe)
+{
+        struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
+
+        if (pipe->state == VSP1_PIPELINE_STOPPED) {
+                vsp1_write(vsp1, VI6_CMD(pipe->output->entity.index),
+                           VI6_CMD_STRCMD);
+                pipe->state = VSP1_PIPELINE_RUNNING;
+        }
+
+        pipe->buffers_ready = 0;
+}
+
+bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe)
+{
+        unsigned long flags;
+        bool stopped;
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+        stopped = pipe->state == VSP1_PIPELINE_STOPPED;
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+        return stopped;
+}
+
+int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+{
+        struct vsp1_entity *entity;
+        unsigned long flags;
+        int ret;
+
+        if (pipe->dl) {
+                /* When using display lists in continuous frame mode the only
+                 * way to stop the pipeline is to reset the hardware.
+                 */
+                ret = vsp1_reset_wpf(pipe->output->entity.vsp1,
+                                     pipe->output->entity.index);
+                if (ret == 0) {
+                        spin_lock_irqsave(&pipe->irqlock, flags);
+                        pipe->state = VSP1_PIPELINE_STOPPED;
+                        spin_unlock_irqrestore(&pipe->irqlock, flags);
+                }
+        } else {
+                /* Otherwise just request a stop and wait. */
+                spin_lock_irqsave(&pipe->irqlock, flags);
+                if (pipe->state == VSP1_PIPELINE_RUNNING)
+                        pipe->state = VSP1_PIPELINE_STOPPING;
+                spin_unlock_irqrestore(&pipe->irqlock, flags);
+
+                ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
+                                         msecs_to_jiffies(500));
+                ret = ret == 0 ? -ETIMEDOUT : 0;
+        }
+
+        list_for_each_entry(entity, &pipe->entities, list_pipe) {
+                if (entity->route && entity->route->reg)
+                        vsp1_write(entity->vsp1, entity->route->reg,
+                                   VI6_DPR_NODE_UNUSED);
+
+                v4l2_subdev_call(&entity->subdev, video, s_stream, 0);
+        }
+
+        return ret;
+}
+
+bool vsp1_pipeline_ready(struct vsp1_pipeline *pipe)
+{
+        unsigned int mask;
+
+        mask = ((1 << pipe->num_inputs) - 1) << 1;
+        if (!pipe->lif)
+                mask |= 1 << 0;
+
+        return pipe->buffers_ready == mask;
+}
+
+void vsp1_pipeline_display_start(struct vsp1_pipeline *pipe)
+{
+        if (pipe->dl)
+                vsp1_dl_irq_display_start(pipe->dl);
+}
+
+void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
+{
+        enum vsp1_pipeline_state state;
+        unsigned long flags;
+
+        if (pipe == NULL)
+                return;
+
+        if (pipe->dl)
+                vsp1_dl_irq_frame_end(pipe->dl);
+
+        /* Signal frame end to the pipeline handler. */
+        pipe->frame_end(pipe);
+
+        spin_lock_irqsave(&pipe->irqlock, flags);
+
+        state = pipe->state;
+
+        /* When using display lists in continuous frame mode the pipeline is
+         * automatically restarted by the hardware.
+         */
+        if (!pipe->dl)
+                pipe->state = VSP1_PIPELINE_STOPPED;
+
+        /* If a stop has been requested, mark the pipeline as stopped and
+         * return.
+         */
+        if (state == VSP1_PIPELINE_STOPPING) {
+                wake_up(&pipe->wq);
+                goto done;
+        }
+
+        /* Restart the pipeline if ready. */
+        if (vsp1_pipeline_ready(pipe))
+                vsp1_pipeline_run(pipe);
+
+done:
+        spin_unlock_irqrestore(&pipe->irqlock, flags);
+}
+
+/*
+ * Propagate the alpha value through the pipeline.
+ *
+ * As the UDS has restricted scaling capabilities when the alpha component needs
+ * to be scaled, we disable alpha scaling when the UDS input has a fixed alpha
+ * value. The UDS then outputs a fixed alpha value which needs to be programmed
+ * from the input RPF alpha.
+ */
+void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
+                                   struct vsp1_entity *input,
+                                   unsigned int alpha)
+{
+        struct vsp1_entity *entity;
+        struct media_pad *pad;
+
+        pad = media_entity_remote_pad(&input->pads[RWPF_PAD_SOURCE]);
+
+        while (pad) {
+                if (!is_media_entity_v4l2_subdev(pad->entity))
+                        break;
+
+                entity = to_vsp1_entity(media_entity_to_v4l2_subdev(pad->entity));
+
+                /* The BRU background color has a fixed alpha value set to 255,
+                 * the output alpha value is thus always equal to 255.
+                 */
+                if (entity->type == VSP1_ENTITY_BRU)
+                        alpha = 255;
+
+                if (entity->type == VSP1_ENTITY_UDS) {
+                        struct vsp1_uds *uds = to_uds(&entity->subdev);
+
+                        vsp1_uds_set_alpha(uds, alpha);
+                        break;
+                }
+
+                pad = &entity->pads[entity->source_pad];
+                pad = media_entity_remote_pad(pad);
+        }
+}
+
+void vsp1_pipelines_suspend(struct vsp1_device *vsp1)
+{
+        unsigned long flags;
+        unsigned int i;
+        int ret;
+
+        /* To avoid increasing the system suspend time needlessly, loop over the
+         * pipelines twice, first to set them all to the stopping state, and
+         * then to wait for the stop to complete.
+         */
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
+                struct vsp1_rwpf *wpf = vsp1->wpf[i];
+                struct vsp1_pipeline *pipe;
+
+                if (wpf == NULL)
+                        continue;
+
+                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
+                if (pipe == NULL)
+                        continue;
+
+                spin_lock_irqsave(&pipe->irqlock, flags);
+                if (pipe->state == VSP1_PIPELINE_RUNNING)
+                        pipe->state = VSP1_PIPELINE_STOPPING;
+                spin_unlock_irqrestore(&pipe->irqlock, flags);
+        }
+
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
+                struct vsp1_rwpf *wpf = vsp1->wpf[i];
+                struct vsp1_pipeline *pipe;
+
+                if (wpf == NULL)
+                        continue;
+
+                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
+                if (pipe == NULL)
+                        continue;
+
+                ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
+                                         msecs_to_jiffies(500));
+                if (ret == 0)
+                        dev_warn(vsp1->dev, "pipeline %u stop timeout\n",
+                                 wpf->entity.index);
+        }
+}
+
+void vsp1_pipelines_resume(struct vsp1_device *vsp1)
+{
+        unsigned int i;
+
+        /* Resume pipeline all running pipelines. */
+        for (i = 0; i < vsp1->info->wpf_count; ++i) {
+                struct vsp1_rwpf *wpf = vsp1->wpf[i];
+                struct vsp1_pipeline *pipe;
+
+                if (wpf == NULL)
+                        continue;
+
+                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
+                if (pipe == NULL)
+                        continue;
+
+                if (vsp1_pipeline_ready(pipe))
+                        vsp1_pipeline_run(pipe);
+        }
+}
diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platform/vsp1/vsp1_pipe.h
new file mode 100644
index 000000000000..b2f3a8a896c9
--- /dev/null
+++ b/drivers/media/platform/vsp1/vsp1_pipe.h
@@ -0,0 +1,134 @@
+/*
+ * vsp1_pipe.h  --  R-Car VSP1 Pipeline
+ *
+ * Copyright (C) 2013-2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __VSP1_PIPE_H__
+#define __VSP1_PIPE_H__
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+
+#include <media/media-entity.h>
+
+struct vsp1_dl;
+struct vsp1_rwpf;
+
+/*
+ * struct vsp1_format_info - VSP1 video format description
+ * @mbus: media bus format code
+ * @fourcc: V4L2 pixel format FCC identifier
+ * @planes: number of planes
+ * @bpp: bits per pixel
+ * @hwfmt: VSP1 hardware format
+ * @swap_yc: the Y and C components are swapped (Y comes before C)
+ * @swap_uv: the U and V components are swapped (V comes before U)
+ * @hsub: horizontal subsampling factor
+ * @vsub: vertical subsampling factor
+ * @alpha: has an alpha channel
+ */
+struct vsp1_format_info {
+        u32 fourcc;
+        unsigned int mbus;
+        unsigned int hwfmt;
+        unsigned int swap;
+        unsigned int planes;
+        unsigned int bpp[3];
+        bool swap_yc;
+        bool swap_uv;
+        unsigned int hsub;
+        unsigned int vsub;
+        bool alpha;
+};
+
+enum vsp1_pipeline_state {
+        VSP1_PIPELINE_STOPPED,
+        VSP1_PIPELINE_RUNNING,
+        VSP1_PIPELINE_STOPPING,
+};
+
+/*
+ * struct vsp1_pipeline - A VSP1 hardware pipeline
+ * @pipe: the media pipeline
+ * @irqlock: protects the pipeline state
+ * @state: current state
+ * @wq: work queue to wait for state change completion
+ * @frame_end: frame end interrupt handler
+ * @lock: protects the pipeline use count and stream count
+ * @use_count: number of video nodes using the pipeline
+ * @stream_count: number of streaming video nodes
+ * @buffers_ready: bitmask of RPFs and WPFs with at least one buffer available
+ * @num_inputs: number of RPFs
+ * @inputs: array of RPFs in the pipeline (indexed by RPF index)
+ * @output: WPF at the output of the pipeline
+ * @bru: BRU entity, if present
+ * @lif: LIF entity, if present
+ * @uds: UDS entity, if present
+ * @uds_input: entity at the input of the UDS, if the UDS is present
+ * @entities: list of entities in the pipeline
+ * @dl: display list associated with the pipeline
+ */
+struct vsp1_pipeline {
+        struct media_pipeline pipe;
+
+        spinlock_t irqlock;
+        enum vsp1_pipeline_state state;
+        wait_queue_head_t wq;
+
+        void (*frame_end)(struct vsp1_pipeline *pipe);
+
+        struct mutex lock;
+        unsigned int use_count;
+        unsigned int stream_count;
+        unsigned int buffers_ready;
+
+        unsigned int num_inputs;
+        struct vsp1_rwpf *inputs[VSP1_MAX_RPF];
+        struct vsp1_rwpf *output;
+        struct vsp1_entity *bru;
+        struct vsp1_entity *lif;
+        struct vsp1_entity *uds;
+        struct vsp1_entity *uds_input;
+
+        struct list_head entities;
+
+        struct vsp1_dl *dl;
+};
+
+static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e)
+{
+        if (likely(e->pipe))
+                return container_of(e->pipe, struct vsp1_pipeline, pipe);
+        else
+                return NULL;
+}
+
+void vsp1_pipeline_reset(struct vsp1_pipeline *pipe);
+void vsp1_pipeline_init(struct vsp1_pipeline *pipe);
+
+void vsp1_pipeline_run(struct vsp1_pipeline *pipe);
+bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe);
+int vsp1_pipeline_stop(struct vsp1_pipeline *pipe);
+bool vsp1_pipeline_ready(struct vsp1_pipeline *pipe);
+
+void vsp1_pipeline_display_start(struct vsp1_pipeline *pipe);
+void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe);
+
+void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
+                                   struct vsp1_entity *input,
+                                   unsigned int alpha);
+
+void vsp1_pipelines_suspend(struct vsp1_device *vsp1);
+void vsp1_pipelines_resume(struct vsp1_device *vsp1);
+
+const struct vsp1_format_info *vsp1_get_format_info(u32 fourcc);
+
+#endif /* __VSP1_PIPE_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index 25b48738b147..069216f0eb44 100644
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -46,7 +46,7 @@
 #define VI6_DISP_IRQ_ENB_LNEE(n)        (1 << (n))
 
 #define VI6_DISP_IRQ_STA                0x007c
-#define VI6_DISP_IRQ_STA_DSE            (1 << 8)
+#define VI6_DISP_IRQ_STA_DST            (1 << 8)
 #define VI6_DISP_IRQ_STA_MAE            (1 << 5)
 #define VI6_DISP_IRQ_STA_LNE(n)         (1 << (n))
 
@@ -322,7 +322,7 @@
 #define VI6_DPR_NODE_SRU                16
 #define VI6_DPR_NODE_UDS(n)             (17 + (n))
 #define VI6_DPR_NODE_LUT                22
-#define VI6_DPR_NODE_BRU_IN(n)          (23 + (n))
+#define VI6_DPR_NODE_BRU_IN(n)          (((n) <= 3) ? 23 + (n) : 49)
 #define VI6_DPR_NODE_BRU_OUT            27
 #define VI6_DPR_NODE_CLU                29
 #define VI6_DPR_NODE_HST                30
@@ -504,12 +504,12 @@
 #define VI6_BRU_VIRRPF_COL_BCB_MASK     (0xff << 0)
 #define VI6_BRU_VIRRPF_COL_BCB_SHIFT    0
 
-#define VI6_BRU_CTRL(n)                 (0x2c10 + (n) * 8)
+#define VI6_BRU_CTRL(n)                 (0x2c10 + (n) * 8 + ((n) <= 3 ? 0 : 4))
 #define VI6_BRU_CTRL_RBC                (1 << 31)
-#define VI6_BRU_CTRL_DSTSEL_BRUIN(n)    ((n) << 20)
+#define VI6_BRU_CTRL_DSTSEL_BRUIN(n)    (((n) <= 3 ? (n) : (n)+1) << 20)
 #define VI6_BRU_CTRL_DSTSEL_VRPF        (4 << 20)
 #define VI6_BRU_CTRL_DSTSEL_MASK        (7 << 20)
-#define VI6_BRU_CTRL_SRCSEL_BRUIN(n)    ((n) << 16)
+#define VI6_BRU_CTRL_SRCSEL_BRUIN(n)    (((n) <= 3 ? (n) : (n)+1) << 16)
 #define VI6_BRU_CTRL_SRCSEL_VRPF        (4 << 16)
 #define VI6_BRU_CTRL_SRCSEL_MASK        (7 << 16)
 #define VI6_BRU_CTRL_CROP(rop)          ((rop) << 4)
@@ -517,7 +517,7 @@
 #define VI6_BRU_CTRL_AROP(rop)          ((rop) << 0)
 #define VI6_BRU_CTRL_AROP_MASK          (0xf << 0)
 
-#define VI6_BRU_BLD(n)                  (0x2c14 + (n) * 8)
+#define VI6_BRU_BLD(n)                  (0x2c14 + (n) * 8 + ((n) <= 3 ? 0 : 4))
 #define VI6_BRU_BLD_CBES                (1 << 31)
 #define VI6_BRU_BLD_CCMDX_DST_A         (0 << 28)
 #define VI6_BRU_BLD_CCMDX_255_DST_A     (1 << 28)
@@ -551,7 +551,7 @@
 #define VI6_BRU_BLD_COEFY_SHIFT         0
 
 #define VI6_BRU_ROP                     0x2c30
-#define VI6_BRU_ROP_DSTSEL_BRUIN(n)     ((n) << 20)
+#define VI6_BRU_ROP_DSTSEL_BRUIN(n)     (((n) <= 3 ? (n) : (n)+1) << 20)
 #define VI6_BRU_ROP_DSTSEL_VRPF         (4 << 20)
 #define VI6_BRU_ROP_DSTSEL_MASK         (7 << 20)
 #define VI6_BRU_ROP_CROP(rop)           ((rop) << 4)
@@ -625,6 +625,24 @@
 #define VI6_SECURITY_CTRL1              0x3d04
 
 /* -----------------------------------------------------------------------------
+ * IP Version Registers
+ */
+
+#define VI6_IP_VERSION                  0x3f00
+#define VI6_IP_VERSION_MODEL_MASK       (0xff << 8)
+#define VI6_IP_VERSION_MODEL_VSPS_H2    (0x09 << 8)
+#define VI6_IP_VERSION_MODEL_VSPR_H2    (0x0a << 8)
+#define VI6_IP_VERSION_MODEL_VSPD_GEN2  (0x0b << 8)
+#define VI6_IP_VERSION_MODEL_VSPS_M2    (0x0c << 8)
+#define VI6_IP_VERSION_MODEL_VSPI_GEN3  (0x14 << 8)
+#define VI6_IP_VERSION_MODEL_VSPBD_GEN3 (0x15 << 8)
+#define VI6_IP_VERSION_MODEL_VSPBC_GEN3 (0x16 << 8)
+#define VI6_IP_VERSION_MODEL_VSPD_GEN3  (0x17 << 8)
+#define VI6_IP_VERSION_SOC_MASK         (0xff << 0)
+#define VI6_IP_VERSION_SOC_H            (0x01 << 0)
+#define VI6_IP_VERSION_SOC_M            (0x02 << 0)
+
+/* -----------------------------------------------------------------------------
  * RPF CLUT Registers
  */
 
diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
index 924538223d3e..5bc1d1574a43 100644
--- a/drivers/media/platform/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rpf.c
@@ -26,16 +26,10 @@
  * Device Access
  */
 
-static inline u32 vsp1_rpf_read(struct vsp1_rwpf *rpf, u32 reg)
-{
-        return vsp1_read(rpf->entity.vsp1,
-                         reg + rpf->entity.index * VI6_RPF_OFFSET);
-}
-
 static inline void vsp1_rpf_write(struct vsp1_rwpf *rpf, u32 reg, u32 data)
 {
-        vsp1_write(rpf->entity.vsp1,
-                   reg + rpf->entity.index * VI6_RPF_OFFSET, data);
+        vsp1_mod_write(&rpf->entity, reg + rpf->entity.index * VI6_RPF_OFFSET,
+                       data);
 }
 
 /* -----------------------------------------------------------------------------
@@ -74,9 +68,11 @@ static const struct v4l2_ctrl_ops rpf_ctrl_ops = {
 
 static int rpf_s_stream(struct v4l2_subdev *subdev, int enable)
 {
+        struct vsp1_pipeline *pipe = to_vsp1_pipeline(&subdev->entity);
         struct vsp1_rwpf *rpf = to_rwpf(subdev);
-        const struct vsp1_format_info *fmtinfo = rpf->video.fmtinfo;
-        const struct v4l2_pix_format_mplane *format = &rpf->video.format;
+        struct vsp1_device *vsp1 = rpf->entity.vsp1;
+        const struct vsp1_format_info *fmtinfo = rpf->fmtinfo;
+        const struct v4l2_pix_format_mplane *format = &rpf->format;
         const struct v4l2_rect *crop = &rpf->crop;
         u32 pstride;
         u32 infmt;
@@ -154,6 +150,15 @@ static int rpf_s_stream(struct v4l2_subdev *subdev, int enable)
         vsp1_rpf_write(rpf, VI6_RPF_ALPH_SEL, VI6_RPF_ALPH_SEL_AEXT_EXT |
                        (fmtinfo->alpha ? VI6_RPF_ALPH_SEL_ASEL_PACKED
                                        : VI6_RPF_ALPH_SEL_ASEL_FIXED));
+
+        if (vsp1->info->uapi)
+                mutex_lock(rpf->ctrls.lock);
+        vsp1_rpf_write(rpf, VI6_RPF_VRTCOL_SET,
+                       rpf->alpha->cur.val << VI6_RPF_VRTCOL_SET_LAYA_SHIFT);
+        vsp1_pipeline_propagate_alpha(pipe, &rpf->entity, rpf->alpha->cur.val);
+        if (vsp1->info->uapi)
+                mutex_unlock(rpf->ctrls.lock);
+
         vsp1_rpf_write(rpf, VI6_RPF_MSK_CTRL, 0);
         vsp1_rpf_write(rpf, VI6_RPF_CKEY_CTRL, 0);
 
@@ -186,30 +191,28 @@ static struct v4l2_subdev_ops rpf_ops = {
  * Video Device Operations
  */
 
-static void rpf_vdev_queue(struct vsp1_video *video,
-                           struct vsp1_video_buffer *buf)
+static void rpf_set_memory(struct vsp1_rwpf *rpf, struct vsp1_rwpf_memory *mem)
 {
-        struct vsp1_rwpf *rpf = container_of(video, struct vsp1_rwpf, video);
         unsigned int i;
 
         for (i = 0; i < 3; ++i)
-                rpf->buf_addr[i] = buf->addr[i];
+                rpf->buf_addr[i] = mem->addr[i];
 
         if (!vsp1_entity_is_streaming(&rpf->entity))
                 return;
 
         vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y,
-                       buf->addr[0] + rpf->offsets[0]);
-        if (buf->buf.vb2_buf.num_planes > 1)
+                       mem->addr[0] + rpf->offsets[0]);
+        if (mem->num_planes > 1)
                 vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C0,
-                               buf->addr[1] + rpf->offsets[1]);
-        if (buf->buf.vb2_buf.num_planes > 2)
+                               mem->addr[1] + rpf->offsets[1]);
+        if (mem->num_planes > 2)
                 vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C1,
-                               buf->addr[2] + rpf->offsets[1]);
+                               mem->addr[2] + rpf->offsets[1]);
 }
 
-static const struct vsp1_video_operations rpf_vdev_ops = {
-        .queue = rpf_vdev_queue,
+static const struct vsp1_rwpf_operations rpf_vdev_ops = {
+        .set_memory = rpf_set_memory,
 };
 
 /* -----------------------------------------------------------------------------
@@ -219,7 +222,6 @@ static const struct vsp1_video_operations rpf_vdev_ops = {
 struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
 {
         struct v4l2_subdev *subdev;
-        struct vsp1_video *video;
         struct vsp1_rwpf *rpf;
         int ret;
 
@@ -227,6 +229,8 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
         if (rpf == NULL)
                 return ERR_PTR(-ENOMEM);
 
+        rpf->ops = &rpf_vdev_ops;
+
         rpf->max_width = RPF_MAX_WIDTH;
         rpf->max_height = RPF_MAX_HEIGHT;
 
@@ -241,7 +245,7 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
         subdev = &rpf->entity.subdev;
         v4l2_subdev_init(subdev, &rpf_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s rpf.%u",
                  dev_name(vsp1->dev), index);
@@ -252,8 +256,9 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
 
         /* Initialize the control handler. */
         v4l2_ctrl_handler_init(&rpf->ctrls, 1);
-        v4l2_ctrl_new_std(&rpf->ctrls, &rpf_ctrl_ops, V4L2_CID_ALPHA_COMPONENT,
-                          0, 255, 1, 255);
+        rpf->alpha = v4l2_ctrl_new_std(&rpf->ctrls, &rpf_ctrl_ops,
+                                       V4L2_CID_ALPHA_COMPONENT,
+                                       0, 255, 1, 255);
 
         rpf->entity.subdev.ctrl_handler = &rpf->ctrls;
 
@@ -264,42 +269,9 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
                 goto error;
         }
 
-        /* Initialize the video device. */
-        video = &rpf->video;
-
-        video->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-        video->vsp1 = vsp1;
-        video->ops = &rpf_vdev_ops;
-
-        ret = vsp1_video_init(video, &rpf->entity);
-        if (ret < 0)
-                goto error;
-
-        rpf->entity.video = video;
-
         return rpf;
 
 error:
         vsp1_entity_destroy(&rpf->entity);
         return ERR_PTR(ret);
 }
-
-/*
- * vsp1_rpf_create_links() - RPF pads links creation
- * @vsp1: Pointer to VSP1 device
- * @entity: Pointer to VSP1 entity
- *
- * return negative error code or zero on success
- */
-int vsp1_rpf_create_links(struct vsp1_device *vsp1,
-                               struct vsp1_entity *entity)
-{
-        struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev);
-
-        /* Connect the video device to the RPF. */
-        return media_create_pad_link(&rpf->video.video.entity, 0,
-                                     &rpf->entity.subdev.entity,
-                                     RWPF_PAD_SINK,
-                                     MEDIA_LNK_FL_ENABLED |
-                                     MEDIA_LNK_FL_IMMUTABLE);
-}
diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platform/vsp1/vsp1_rwpf.h
index 731d36e5258d..8e8235682ada 100644
--- a/drivers/media/platform/vsp1/vsp1_rwpf.h
+++ b/drivers/media/platform/vsp1/vsp1_rwpf.h
@@ -19,19 +19,39 @@
 
 #include "vsp1.h"
 #include "vsp1_entity.h"
-#include "vsp1_video.h"
 
 #define RWPF_PAD_SINK                           0
 #define RWPF_PAD_SOURCE                         1
 
+struct v4l2_ctrl;
+struct vsp1_rwpf;
+struct vsp1_video;
+
+struct vsp1_rwpf_memory {
+        unsigned int num_planes;
+        dma_addr_t addr[3];
+        unsigned int length[3];
+};
+
+struct vsp1_rwpf_operations {
+        void (*set_memory)(struct vsp1_rwpf *rwpf,
+                           struct vsp1_rwpf_memory *mem);
+};
+
 struct vsp1_rwpf {
         struct vsp1_entity entity;
-        struct vsp1_video video;
         struct v4l2_ctrl_handler ctrls;
+        struct v4l2_ctrl *alpha;
+
+        struct vsp1_video *video;
+
+        const struct vsp1_rwpf_operations *ops;
 
         unsigned int max_width;
         unsigned int max_height;
 
+        struct v4l2_pix_format_mplane format;
+        const struct vsp1_format_info *fmtinfo;
         struct {
                 unsigned int left;
                 unsigned int top;
@@ -50,11 +70,6 @@ static inline struct vsp1_rwpf *to_rwpf(struct v4l2_subdev *subdev)
 struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index);
 struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index);
 
-int vsp1_rpf_create_links(struct vsp1_device *vsp1,
-                               struct vsp1_entity *entity);
-int vsp1_wpf_create_links(struct vsp1_device *vsp1,
-                               struct vsp1_entity *entity);
-
 int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_pad_config *cfg,
                              struct v4l2_subdev_mbus_code_enum *code);
diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index 6310acab60e7..cc09efbfb24f 100644
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -151,10 +151,13 @@ static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
         /* Take the control handler lock to ensure that the CTRL0 value won't be
          * changed behind our back by a set control operation.
          */
-        mutex_lock(sru->ctrls.lock);
+        if (sru->entity.vsp1->info->uapi)
+                mutex_lock(sru->ctrls.lock);
         ctrl0 |= vsp1_sru_read(sru, VI6_SRU_CTRL0)
                & (VI6_SRU_CTRL0_PARAM0_MASK | VI6_SRU_CTRL0_PARAM1_MASK);
-        mutex_unlock(sru->ctrls.lock);
+        vsp1_sru_write(sru, VI6_SRU_CTRL0, ctrl0);
+        if (sru->entity.vsp1->info->uapi)
+                mutex_unlock(sru->ctrls.lock);
 
         vsp1_sru_write(sru, VI6_SRU_CTRL1, VI6_SRU_CTRL1_PARAM5);
 
@@ -360,7 +363,7 @@ struct vsp1_sru *vsp1_sru_create(struct vsp1_device *vsp1)
         subdev = &sru->entity.subdev;
         v4l2_subdev_init(subdev, &sru_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s sru",
                  dev_name(vsp1->dev));
diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index ccc8243e3493..bba67770cf95 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -29,12 +29,6 @@
  * Device Access
  */
 
-static inline u32 vsp1_uds_read(struct vsp1_uds *uds, u32 reg)
-{
-        return vsp1_read(uds->entity.vsp1,
-                         reg + uds->entity.index * VI6_UDS_OFFSET);
-}
-
 static inline void vsp1_uds_write(struct vsp1_uds *uds, u32 reg, u32 data)
 {
         vsp1_write(uds->entity.vsp1,
@@ -344,7 +338,7 @@ struct vsp1_uds *vsp1_uds_create(struct vsp1_device *vsp1, unsigned int index)
         subdev = &uds->entity.subdev;
         v4l2_subdev_init(subdev, &uds_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s uds.%u",
                  dev_name(vsp1->dev), index);
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index b4dca57d1ae3..61ee0f92c1e5 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -14,10 +14,10 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <linux/wait.h>
 
 #include <media/media-entity.h>
 #include <media/v4l2-dev.h>
@@ -30,6 +30,7 @@
 #include "vsp1.h"
 #include "vsp1_bru.h"
 #include "vsp1_entity.h"
+#include "vsp1_pipe.h"
 #include "vsp1_rwpf.h"
 #include "vsp1_uds.h"
 #include "vsp1_video.h"
@@ -47,113 +48,6 @@
  * Helper functions
  */
 
-static const struct vsp1_format_info vsp1_video_formats[] = {
-        { V4L2_PIX_FMT_RGB332, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_RGB_332, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 8, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS,
-          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_XRGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS,
-          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_ARGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS,
-          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_XRGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS,
-          1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB565, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_RGB_565, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS,
-          1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_BGR24, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_BGR_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB24, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_RGB_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ABGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
-          1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XBGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
-          1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
-          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_UYVY, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 16, 0, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_VYUY, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 16, 0, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUYV, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 16, 0, 0 }, true, false, 2, 1, false },
-        { V4L2_PIX_FMT_YVYU, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          1, { 16, 0, 0 }, true, true, 2, 1, false },
-        { V4L2_PIX_FMT_NV12M, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          2, { 8, 16, 0 }, false, false, 2, 2, false },
-        { V4L2_PIX_FMT_NV21M, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          2, { 8, 16, 0 }, false, true, 2, 2, false },
-        { V4L2_PIX_FMT_NV16M, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          2, { 8, 16, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_NV61M, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          2, { 8, 16, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUV420M, MEDIA_BUS_FMT_AYUV8_1X32,
-          VI6_FMT_Y_U_V_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
-          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
-          3, { 8, 8, 8 }, false, false, 2, 2, false },
-};
-
-/*
- * vsp1_get_format_info - Retrieve format information for a 4CC
- * @fourcc: the format 4CC
- *
- * Return a pointer to the format information structure corresponding to the
- * given V4L2 format 4CC, or NULL if no corresponding format can be found.
- */
-static const struct vsp1_format_info *vsp1_get_format_info(u32 fourcc)
-{
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(vsp1_video_formats); ++i) {
-                const struct vsp1_format_info *info = &vsp1_video_formats[i];
-
-                if (info->fourcc == fourcc)
-                        return info;
-        }
-
-        return NULL;
-}
-
-
 static struct v4l2_subdev *
 vsp1_video_remote_subdev(struct media_pad *local, u32 *pad)
 {
@@ -184,9 +78,9 @@ static int vsp1_video_verify_format(struct vsp1_video *video)
         if (ret < 0)
                 return ret == -ENOIOCTLCMD ? -EINVAL : ret;
 
-        if (video->fmtinfo->mbus != fmt.format.code ||
-            video->format.height != fmt.format.height ||
-            video->format.width != fmt.format.width)
+        if (video->rwpf->fmtinfo->mbus != fmt.format.code ||
+            video->rwpf->format.height != fmt.format.height ||
+            video->rwpf->format.width != fmt.format.width)
                 return -EINVAL;
 
         return 0;
@@ -277,9 +171,9 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
  * Pipeline Management
  */
 
-static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
-                                         struct vsp1_rwpf *input,
-                                         struct vsp1_rwpf *output)
+static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
+                                               struct vsp1_rwpf *input,
+                                               struct vsp1_rwpf *output)
 {
         struct vsp1_entity *entity;
         struct media_entity_enum ent_enum;
@@ -370,29 +264,8 @@ out:
         return rval;
 }
 
-static void __vsp1_pipeline_cleanup(struct vsp1_pipeline *pipe)
-{
-        if (pipe->bru) {
-                struct vsp1_bru *bru = to_bru(&pipe->bru->subdev);
-                unsigned int i;
-
-                for (i = 0; i < ARRAY_SIZE(bru->inputs); ++i)
-                        bru->inputs[i].rpf = NULL;
-        }
-
-        INIT_LIST_HEAD(&pipe->entities);
-        pipe->state = VSP1_PIPELINE_STOPPED;
-        pipe->buffers_ready = 0;
-        pipe->num_video = 0;
-        pipe->num_inputs = 0;
-        pipe->output = NULL;
-        pipe->bru = NULL;
-        pipe->lif = NULL;
-        pipe->uds = NULL;
-}
-
-static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
-                                  struct vsp1_video *video)
+static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe,
+                                        struct vsp1_video *video)
 {
         struct media_entity_graph graph;
         struct media_entity *entity = &video->video.entity;
@@ -416,10 +289,8 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
                 struct vsp1_rwpf *rwpf;
                 struct vsp1_entity *e;
 
-                if (is_media_entity_v4l2_io(entity)) {
-                        pipe->num_video++;
+                if (is_media_entity_v4l2_io(entity))
                         continue;
-                }
 
                 subdev = media_entity_to_v4l2_subdev(entity);
                 e = to_vsp1_entity(subdev);
@@ -427,12 +298,12 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
 
                 if (e->type == VSP1_ENTITY_RPF) {
                         rwpf = to_rwpf(subdev);
-                        pipe->inputs[pipe->num_inputs++] = rwpf;
-                        rwpf->video.pipe_index = pipe->num_inputs;
+                        pipe->inputs[rwpf->entity.index] = rwpf;
+                        rwpf->video->pipe_index = ++pipe->num_inputs;
                 } else if (e->type == VSP1_ENTITY_WPF) {
                         rwpf = to_rwpf(subdev);
-                        pipe->output = to_rwpf(subdev);
-                        rwpf->video.pipe_index = 0;
+                        pipe->output = rwpf;
+                        rwpf->video->pipe_index = 0;
                 } else if (e->type == VSP1_ENTITY_LIF) {
                         pipe->lif = e;
                 } else if (e->type == VSP1_ENTITY_BRU) {
@@ -453,9 +324,12 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
         /* Follow links downstream for each input and make sure the graph
          * contains no loop and that all branches end at the output WPF.
          */
-        for (i = 0; i < pipe->num_inputs; ++i) {
-                ret = vsp1_pipeline_validate_branch(pipe, pipe->inputs[i],
-                                                    pipe->output);
+        for (i = 0; i < video->vsp1->info->rpf_count; ++i) {
+                if (!pipe->inputs[i])
+                        continue;
+
+                ret = vsp1_video_pipeline_validate_branch(pipe, pipe->inputs[i],
+                                                          pipe->output);
                 if (ret < 0)
                         goto error;
         }
@@ -463,12 +337,12 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
         return 0;
 
 error:
-        __vsp1_pipeline_cleanup(pipe);
+        vsp1_pipeline_reset(pipe);
         return ret;
 }
 
-static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
-                              struct vsp1_video *video)
+static int vsp1_video_pipeline_init(struct vsp1_pipeline *pipe,
+                                    struct vsp1_video *video)
 {
         int ret;
 
@@ -476,7 +350,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
 
         /* If we're the first user validate and initialize the pipeline. */
         if (pipe->use_count == 0) {
-                ret = vsp1_pipeline_validate(pipe, video);
+                ret = vsp1_video_pipeline_validate(pipe, video);
                 if (ret < 0)
                         goto done;
         }
@@ -489,75 +363,17 @@ done:
         return ret;
 }
 
-static void vsp1_pipeline_cleanup(struct vsp1_pipeline *pipe)
+static void vsp1_video_pipeline_cleanup(struct vsp1_pipeline *pipe)
 {
         mutex_lock(&pipe->lock);
 
         /* If we're the last user clean up the pipeline. */
         if (--pipe->use_count == 0)
-                __vsp1_pipeline_cleanup(pipe);
+                vsp1_pipeline_reset(pipe);
 
         mutex_unlock(&pipe->lock);
 }
 
-static void vsp1_pipeline_run(struct vsp1_pipeline *pipe)
-{
-        struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
-
-        vsp1_write(vsp1, VI6_CMD(pipe->output->entity.index), VI6_CMD_STRCMD);
-        pipe->state = VSP1_PIPELINE_RUNNING;
-        pipe->buffers_ready = 0;
-}
-
-static bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe)
-{
-        unsigned long flags;
-        bool stopped;
-
-        spin_lock_irqsave(&pipe->irqlock, flags);
-        stopped = pipe->state == VSP1_PIPELINE_STOPPED;
-        spin_unlock_irqrestore(&pipe->irqlock, flags);
-
-        return stopped;
-}
-
-static int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
-{
-        struct vsp1_entity *entity;
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(&pipe->irqlock, flags);
-        if (pipe->state == VSP1_PIPELINE_RUNNING)
-                pipe->state = VSP1_PIPELINE_STOPPING;
-        spin_unlock_irqrestore(&pipe->irqlock, flags);
-
-        ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
-                                 msecs_to_jiffies(500));
-        ret = ret == 0 ? -ETIMEDOUT : 0;
-
-        list_for_each_entry(entity, &pipe->entities, list_pipe) {
-                if (entity->route && entity->route->reg)
-                        vsp1_write(entity->vsp1, entity->route->reg,
-                                   VI6_DPR_NODE_UNUSED);
-
-                v4l2_subdev_call(&entity->subdev, video, s_stream, 0);
-        }
-
-        return ret;
-}
-
-static bool vsp1_pipeline_ready(struct vsp1_pipeline *pipe)
-{
-        unsigned int mask;
-
-        mask = ((1 << pipe->num_inputs) - 1) << 1;
-        if (!pipe->lif)
-                mask |= 1 << 0;
-
-        return pipe->buffers_ready == mask;
-}
-
 /*
  * vsp1_video_complete_buffer - Complete the current buffer
  * @video: the video node
@@ -572,12 +388,12 @@ static bool vsp1_pipeline_ready(struct vsp1_pipeline *pipe)
  *
  * Return the next queued buffer or NULL if the queue is empty.
  */
-static struct vsp1_video_buffer *
+static struct vsp1_vb2_buffer *
 vsp1_video_complete_buffer(struct vsp1_video *video)
 {
         struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity);
-        struct vsp1_video_buffer *next = NULL;
-        struct vsp1_video_buffer *done;
+        struct vsp1_vb2_buffer *next = NULL;
+        struct vsp1_vb2_buffer *done;
         unsigned long flags;
         unsigned int i;
 
@@ -589,7 +405,7 @@ vsp1_video_complete_buffer(struct vsp1_video *video)
         }
 
         done = list_first_entry(&video->irqqueue,
-                                struct vsp1_video_buffer, queue);
+                                struct vsp1_vb2_buffer, queue);
 
         /* In DU output mode reuse the buffer if the list is singular. */
         if (pipe->lif && list_is_singular(&video->irqqueue)) {
@@ -601,23 +417,25 @@ vsp1_video_complete_buffer(struct vsp1_video *video)
 
         if (!list_empty(&video->irqqueue))
                 next = list_first_entry(&video->irqqueue,
-                                        struct vsp1_video_buffer, queue);
+                                        struct vsp1_vb2_buffer, queue);
 
         spin_unlock_irqrestore(&video->irqlock, flags);
 
         done->buf.sequence = video->sequence++;
         done->buf.vb2_buf.timestamp = ktime_get_ns();
         for (i = 0; i < done->buf.vb2_buf.num_planes; ++i)
-                vb2_set_plane_payload(&done->buf.vb2_buf, i, done->length[i]);
+                vb2_set_plane_payload(&done->buf.vb2_buf, i,
+                                      done->mem.length[i]);
         vb2_buffer_done(&done->buf.vb2_buf, VB2_BUF_STATE_DONE);
 
         return next;
 }
 
 static void vsp1_video_frame_end(struct vsp1_pipeline *pipe,
-                                 struct vsp1_video *video)
+                                 struct vsp1_rwpf *rwpf)
 {
-        struct vsp1_video_buffer *buf;
+        struct vsp1_video *video = rwpf->video;
+        struct vsp1_vb2_buffer *buf;
         unsigned long flags;
 
         buf = vsp1_video_complete_buffer(video);
@@ -626,155 +444,27 @@ static void vsp1_video_frame_end(struct vsp1_pipeline *pipe,
 
         spin_lock_irqsave(&pipe->irqlock, flags);
 
-        video->ops->queue(video, buf);
+        video->rwpf->ops->set_memory(video->rwpf, &buf->mem);
         pipe->buffers_ready |= 1 << video->pipe_index;
 
         spin_unlock_irqrestore(&pipe->irqlock, flags);
 }
 
-void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
+static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe)
 {
-        enum vsp1_pipeline_state state;
-        unsigned long flags;
+        struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
         unsigned int i;
 
-        if (pipe == NULL)
-                return;
-
         /* Complete buffers on all video nodes. */
-        for (i = 0; i < pipe->num_inputs; ++i)
-                vsp1_video_frame_end(pipe, &pipe->inputs[i]->video);
-
-        if (!pipe->lif)
-                vsp1_video_frame_end(pipe, &pipe->output->video);
-
-        spin_lock_irqsave(&pipe->irqlock, flags);
-
-        state = pipe->state;
-        pipe->state = VSP1_PIPELINE_STOPPED;
-
-        /* If a stop has been requested, mark the pipeline as stopped and
-         * return.
-         */
-        if (state == VSP1_PIPELINE_STOPPING) {
-                wake_up(&pipe->wq);
-                goto done;
-        }
-
-        /* Restart the pipeline if ready. */
-        if (vsp1_pipeline_ready(pipe))
-                vsp1_pipeline_run(pipe);
-
-done:
-        spin_unlock_irqrestore(&pipe->irqlock, flags);
-}
-
-/*
- * Propagate the alpha value through the pipeline.
- *
- * As the UDS has restricted scaling capabilities when the alpha component needs
- * to be scaled, we disable alpha scaling when the UDS input has a fixed alpha
- * value. The UDS then outputs a fixed alpha value which needs to be programmed
- * from the input RPF alpha.
- */
-void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
-                                   struct vsp1_entity *input,
-                                   unsigned int alpha)
-{
-        struct vsp1_entity *entity;
-        struct media_pad *pad;
-
-        pad = media_entity_remote_pad(&input->pads[RWPF_PAD_SOURCE]);
-
-        while (pad) {
-                if (!is_media_entity_v4l2_subdev(pad->entity))
-                        break;
-
-                entity = to_vsp1_entity(media_entity_to_v4l2_subdev(pad->entity));
-
-                /* The BRU background color has a fixed alpha value set to 255,
-                 * the output alpha value is thus always equal to 255.
-                 */
-                if (entity->type == VSP1_ENTITY_BRU)
-                        alpha = 255;
-
-                if (entity->type == VSP1_ENTITY_UDS) {
-                        struct vsp1_uds *uds = to_uds(&entity->subdev);
-
-                        vsp1_uds_set_alpha(uds, alpha);
-                        break;
-                }
-
-                pad = &entity->pads[entity->source_pad];
-                pad = media_entity_remote_pad(pad);
-        }
-}
-
-void vsp1_pipelines_suspend(struct vsp1_device *vsp1)
-{
-        unsigned long flags;
-        unsigned int i;
-        int ret;
-
-        /* To avoid increasing the system suspend time needlessly, loop over the
-         * pipelines twice, first to set them all to the stopping state, and then
-         * to wait for the stop to complete.
-         */
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
-                struct vsp1_rwpf *wpf = vsp1->wpf[i];
-                struct vsp1_pipeline *pipe;
-
-                if (wpf == NULL)
-                        continue;
-
-                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
-                if (pipe == NULL)
-                        continue;
-
-                spin_lock_irqsave(&pipe->irqlock, flags);
-                if (pipe->state == VSP1_PIPELINE_RUNNING)
-                        pipe->state = VSP1_PIPELINE_STOPPING;
-                spin_unlock_irqrestore(&pipe->irqlock, flags);
-        }
-
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
-                struct vsp1_rwpf *wpf = vsp1->wpf[i];
-                struct vsp1_pipeline *pipe;
-
-                if (wpf == NULL)
-                        continue;
-
-                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
-                if (pipe == NULL)
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
+                if (!pipe->inputs[i])
                         continue;
 
-                ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
-                                         msecs_to_jiffies(500));
-                if (ret == 0)
-                        dev_warn(vsp1->dev, "pipeline %u stop timeout\n",
-                                 wpf->entity.index);
+                vsp1_video_frame_end(pipe, pipe->inputs[i]);
         }
-}
-
-void vsp1_pipelines_resume(struct vsp1_device *vsp1)
-{
-        unsigned int i;
-
-        /* Resume pipeline all running pipelines. */
-        for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
-                struct vsp1_rwpf *wpf = vsp1->wpf[i];
-                struct vsp1_pipeline *pipe;
 
-                if (wpf == NULL)
-                        continue;
-
-                pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
-                if (pipe == NULL)
-                        continue;
-
-                if (vsp1_pipeline_ready(pipe))
-                        vsp1_pipeline_run(pipe);
-        }
+        if (!pipe->lif)
+                vsp1_video_frame_end(pipe, pipe->output);
 }
 
 /* -----------------------------------------------------------------------------
@@ -787,7 +477,7 @@ vsp1_video_queue_setup(struct vb2_queue *vq,
                      unsigned int sizes[], void *alloc_ctxs[])
 {
         struct vsp1_video *video = vb2_get_drv_priv(vq);
-        const struct v4l2_pix_format_mplane *format = &video->format;
+        const struct v4l2_pix_format_mplane *format = &video->rwpf->format;
         unsigned int i;
 
         if (*nplanes) {
@@ -816,18 +506,20 @@ static int vsp1_video_buffer_prepare(struct vb2_buffer *vb)
 {
         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
-        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
-        const struct v4l2_pix_format_mplane *format = &video->format;
+        struct vsp1_vb2_buffer *buf = to_vsp1_vb2_buffer(vbuf);
+        const struct v4l2_pix_format_mplane *format = &video->rwpf->format;
         unsigned int i;
 
         if (vb->num_planes < format->num_planes)
                 return -EINVAL;
 
+        buf->mem.num_planes = vb->num_planes;
+
         for (i = 0; i < vb->num_planes; ++i) {
-                buf->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);
-                buf->length[i] = vb2_plane_size(vb, i);
+                buf->mem.addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);
+                buf->mem.length[i] = vb2_plane_size(vb, i);
 
-                if (buf->length[i] < format->plane_fmt[i].sizeimage)
+                if (buf->mem.length[i] < format->plane_fmt[i].sizeimage)
                         return -EINVAL;
         }
 
@@ -839,7 +531,7 @@ static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
         struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity);
-        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
+        struct vsp1_vb2_buffer *buf = to_vsp1_vb2_buffer(vbuf);
         unsigned long flags;
         bool empty;
 
@@ -853,7 +545,7 @@ static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
 
         spin_lock_irqsave(&pipe->irqlock, flags);
 
-        video->ops->queue(video, buf);
+        video->rwpf->ops->set_memory(video->rwpf, &buf->mem);
         pipe->buffers_ready |= 1 << video->pipe_index;
 
         if (vb2_is_streaming(&video->queue) &&
@@ -863,18 +555,6 @@ static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
         spin_unlock_irqrestore(&pipe->irqlock, flags);
 }
 
-static void vsp1_entity_route_setup(struct vsp1_entity *source)
-{
-        struct vsp1_entity *sink;
-
-        if (source->route->reg == 0)
-                return;
-
-        sink = container_of(source->sink, struct vsp1_entity, subdev.entity);
-        vsp1_write(source->vsp1, source->route->reg,
-                   sink->route->inputs[source->sink_pad]);
-}
-
 static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
         struct vsp1_video *video = vb2_get_drv_priv(vq);
@@ -884,7 +564,7 @@ static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
         int ret;
 
         mutex_lock(&pipe->lock);
-        if (pipe->stream_count == pipe->num_video - 1) {
+        if (pipe->stream_count == pipe->num_inputs) {
                 if (pipe->uds) {
                         struct vsp1_uds *uds = to_uds(&pipe->uds->subdev);
 
@@ -900,7 +580,7 @@ static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
                                 struct vsp1_rwpf *rpf =
                                         to_rwpf(&pipe->uds_input->subdev);
 
-                                uds->scale_alpha = rpf->video.fmtinfo->alpha;
+                                uds->scale_alpha = rpf->fmtinfo->alpha;
                         }
                 }
 
@@ -931,7 +611,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
 {
         struct vsp1_video *video = vb2_get_drv_priv(vq);
         struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity);
-        struct vsp1_video_buffer *buffer;
+        struct vsp1_vb2_buffer *buffer;
         unsigned long flags;
         int ret;
 
@@ -944,7 +624,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
         }
         mutex_unlock(&pipe->lock);
 
-        vsp1_pipeline_cleanup(pipe);
+        vsp1_video_pipeline_cleanup(pipe);
         media_entity_pipeline_stop(&video->video.entity);
 
         /* Remove all buffers from the IRQ queue. */
@@ -1004,7 +684,7 @@ vsp1_video_get_format(struct file *file, void *fh, struct v4l2_format *format)
                 return -EINVAL;
 
         mutex_lock(&video->lock);
-        format->fmt.pix_mp = video->format;
+        format->fmt.pix_mp = video->rwpf->format;
         mutex_unlock(&video->lock);
 
         return 0;
@@ -1044,8 +724,8 @@ vsp1_video_set_format(struct file *file, void *fh, struct v4l2_format *format)
                 goto done;
         }
 
-        video->format = format->fmt.pix_mp;
-        video->fmtinfo = info;
+        video->rwpf->format = format->fmt.pix_mp;
+        video->rwpf->fmtinfo = info;
 
 done:
         mutex_unlock(&video->lock);
@@ -1085,7 +765,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
         if (ret < 0)
                 goto err_stop;
 
-        ret = vsp1_pipeline_init(pipe, video);
+        ret = vsp1_video_pipeline_init(pipe, video);
         if (ret < 0)
                 goto err_stop;
 
@@ -1097,7 +777,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
         return 0;
 
 err_cleanup:
-        vsp1_pipeline_cleanup(pipe);
+        vsp1_video_pipeline_cleanup(pipe);
 err_stop:
         media_entity_pipeline_stop(&video->video.entity);
         return ret;
@@ -1183,62 +863,64 @@ static struct v4l2_file_operations vsp1_video_fops = {
  * Initialization and Cleanup
  */
 
-int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
+struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
+                                     struct vsp1_rwpf *rwpf)
 {
+        struct vsp1_video *video;
         const char *direction;
         int ret;
 
-        switch (video->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-                direction = "output";
-                video->pad.flags = MEDIA_PAD_FL_SINK;
-                break;
+        video = devm_kzalloc(vsp1->dev, sizeof(*video), GFP_KERNEL);
+        if (!video)
+                return ERR_PTR(-ENOMEM);
+
+        rwpf->video = video;
+
+        video->vsp1 = vsp1;
+        video->rwpf = rwpf;
 
-        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+        if (rwpf->entity.type == VSP1_ENTITY_RPF) {
                 direction = "input";
+                video->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
                 video->pad.flags = MEDIA_PAD_FL_SOURCE;
                 video->video.vfl_dir = VFL_DIR_TX;
-                break;
-
-        default:
-                return -EINVAL;
+        } else {
+                direction = "output";
+                video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+                video->pad.flags = MEDIA_PAD_FL_SINK;
+                video->video.vfl_dir = VFL_DIR_RX;
         }
 
-        video->rwpf = rwpf;
-
         mutex_init(&video->lock);
         spin_lock_init(&video->irqlock);
         INIT_LIST_HEAD(&video->irqqueue);
 
-        mutex_init(&video->pipe.lock);
-        spin_lock_init(&video->pipe.irqlock);
-        INIT_LIST_HEAD(&video->pipe.entities);
-        init_waitqueue_head(&video->pipe.wq);
-        video->pipe.state = VSP1_PIPELINE_STOPPED;
+        vsp1_pipeline_init(&video->pipe);
+        video->pipe.frame_end = vsp1_video_pipeline_frame_end;
 
         /* Initialize the media entity... */
         ret = media_entity_pads_init(&video->video.entity, 1, &video->pad);
         if (ret < 0)
-                return ret;
+                return ERR_PTR(ret);
 
         /* ... and the format ... */
-        video->fmtinfo = vsp1_get_format_info(VSP1_VIDEO_DEF_FORMAT);
-        video->format.pixelformat = video->fmtinfo->fourcc;
-        video->format.colorspace = V4L2_COLORSPACE_SRGB;
-        video->format.field = V4L2_FIELD_NONE;
-        video->format.width = VSP1_VIDEO_DEF_WIDTH;
-        video->format.height = VSP1_VIDEO_DEF_HEIGHT;
-        video->format.num_planes = 1;
-        video->format.plane_fmt[0].bytesperline =
-                video->format.width * video->fmtinfo->bpp[0] / 8;
-        video->format.plane_fmt[0].sizeimage =
-                video->format.plane_fmt[0].bytesperline * video->format.height;
+        rwpf->fmtinfo = vsp1_get_format_info(VSP1_VIDEO_DEF_FORMAT);
+        rwpf->format.pixelformat = rwpf->fmtinfo->fourcc;
+        rwpf->format.colorspace = V4L2_COLORSPACE_SRGB;
+        rwpf->format.field = V4L2_FIELD_NONE;
+        rwpf->format.width = VSP1_VIDEO_DEF_WIDTH;
+        rwpf->format.height = VSP1_VIDEO_DEF_HEIGHT;
+        rwpf->format.num_planes = 1;
+        rwpf->format.plane_fmt[0].bytesperline =
+                rwpf->format.width * rwpf->fmtinfo->bpp[0] / 8;
+        rwpf->format.plane_fmt[0].sizeimage =
+                rwpf->format.plane_fmt[0].bytesperline * rwpf->format.height;
 
         /* ... and the video node... */
         video->video.v4l2_dev = &video->vsp1->v4l2_dev;
         video->video.fops = &vsp1_video_fops;
         snprintf(video->video.name, sizeof(video->video.name), "%s %s",
-                 rwpf->subdev.name, direction);
+                 rwpf->entity.subdev.name, direction);
         video->video.vfl_type = VFL_TYPE_GRABBER;
         video->video.release = video_device_release_empty;
         video->video.ioctl_ops = &vsp1_video_ioctl_ops;
@@ -1256,7 +938,7 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
         video->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         video->queue.lock = &video->lock;
         video->queue.drv_priv = video;
-        video->queue.buf_struct_size = sizeof(struct vsp1_video_buffer);
+        video->queue.buf_struct_size = sizeof(struct vsp1_vb2_buffer);
         video->queue.ops = &vsp1_video_queue_qops;
         video->queue.mem_ops = &vb2_dma_contig_memops;
         video->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
@@ -1274,12 +956,12 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
                 goto error;
         }
 
-        return 0;
+        return video;
 
 error:
         vb2_dma_contig_cleanup_ctx(video->alloc_ctx);
         vsp1_video_cleanup(video);
-        return ret;
+        return ERR_PTR(ret);
 }
 
 void vsp1_video_cleanup(struct vsp1_video *video)
diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h
index a929aa81cdbf..64abd39ee1e7 100644
--- a/drivers/media/platform/vsp1/vsp1_video.h
+++ b/drivers/media/platform/vsp1/vsp1_video.h
@@ -15,115 +15,34 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
-#include <linux/wait.h>
 
-#include <media/media-entity.h>
 #include <media/videobuf2-v4l2.h>
 
-struct vsp1_video;
+#include "vsp1_pipe.h"
+#include "vsp1_rwpf.h"
 
-/*
- * struct vsp1_format_info - VSP1 video format description
- * @mbus: media bus format code
- * @fourcc: V4L2 pixel format FCC identifier
- * @planes: number of planes
- * @bpp: bits per pixel
- * @hwfmt: VSP1 hardware format
- * @swap_yc: the Y and C components are swapped (Y comes before C)
- * @swap_uv: the U and V components are swapped (V comes before U)
- * @hsub: horizontal subsampling factor
- * @vsub: vertical subsampling factor
- * @alpha: has an alpha channel
- */
-struct vsp1_format_info {
-        u32 fourcc;
-        unsigned int mbus;
-        unsigned int hwfmt;
-        unsigned int swap;
-        unsigned int planes;
-        unsigned int bpp[3];
-        bool swap_yc;
-        bool swap_uv;
-        unsigned int hsub;
-        unsigned int vsub;
-        bool alpha;
-};
-
-enum vsp1_pipeline_state {
-        VSP1_PIPELINE_STOPPED,
-        VSP1_PIPELINE_RUNNING,
-        VSP1_PIPELINE_STOPPING,
-};
-
-/*
- * struct vsp1_pipeline - A VSP1 hardware pipeline
- * @media: the media pipeline
- * @irqlock: protects the pipeline state
- * @lock: protects the pipeline use count and stream count
- */
-struct vsp1_pipeline {
-        struct media_pipeline pipe;
-
-        spinlock_t irqlock;
-        enum vsp1_pipeline_state state;
-        wait_queue_head_t wq;
-
-        struct mutex lock;
-        unsigned int use_count;
-        unsigned int stream_count;
-        unsigned int buffers_ready;
-
-        unsigned int num_video;
-        unsigned int num_inputs;
-        struct vsp1_rwpf *inputs[VSP1_MAX_RPF];
-        struct vsp1_rwpf *output;
-        struct vsp1_entity *bru;
-        struct vsp1_entity *lif;
-        struct vsp1_entity *uds;
-        struct vsp1_entity *uds_input;
-
-        struct list_head entities;
-};
-
-static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e)
-{
-        if (likely(e->pipe))
-                return container_of(e->pipe, struct vsp1_pipeline, pipe);
-        else
-                return NULL;
-}
-
-struct vsp1_video_buffer {
+struct vsp1_vb2_buffer {
         struct vb2_v4l2_buffer buf;
         struct list_head queue;
-
-        dma_addr_t addr[3];
-        unsigned int length[3];
+        struct vsp1_rwpf_memory mem;
 };
 
-static inline struct vsp1_video_buffer *
-to_vsp1_video_buffer(struct vb2_v4l2_buffer *vbuf)
+static inline struct vsp1_vb2_buffer *
+to_vsp1_vb2_buffer(struct vb2_v4l2_buffer *vbuf)
 {
-        return container_of(vbuf, struct vsp1_video_buffer, buf);
+        return container_of(vbuf, struct vsp1_vb2_buffer, buf);
 }
 
-struct vsp1_video_operations {
-        void (*queue)(struct vsp1_video *video, struct vsp1_video_buffer *buf);
-};
-
 struct vsp1_video {
+        struct list_head list;
         struct vsp1_device *vsp1;
-        struct vsp1_entity *rwpf;
-
-        const struct vsp1_video_operations *ops;
+        struct vsp1_rwpf *rwpf;
 
         struct video_device video;
         enum v4l2_buf_type type;
         struct media_pad pad;
 
         struct mutex lock;
-        struct v4l2_pix_format_mplane format;
-        const struct vsp1_format_info *fmtinfo;
 
         struct vsp1_pipeline pipe;
         unsigned int pipe_index;
@@ -140,16 +59,8 @@ static inline struct vsp1_video *to_vsp1_video(struct video_device *vdev)
         return container_of(vdev, struct vsp1_video, video);
 }
 
-int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf);
+struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
+                                     struct vsp1_rwpf *rwpf);
 void vsp1_video_cleanup(struct vsp1_video *video);
 
-void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe);
-
-void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
-                                   struct vsp1_entity *input,
-                                   unsigned int alpha);
-
-void vsp1_pipelines_suspend(struct vsp1_device *vsp1);
-void vsp1_pipelines_resume(struct vsp1_device *vsp1);
-
 #endif /* __VSP1_VIDEO_H__ */
diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index cbf514a6582d..c78d4af50fcf 100644
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -34,8 +34,8 @@ static inline u32 vsp1_wpf_read(struct vsp1_rwpf *wpf, u32 reg)
 
 static inline void vsp1_wpf_write(struct vsp1_rwpf *wpf, u32 reg, u32 data)
 {
-        vsp1_write(wpf->entity.vsp1,
-                   reg + wpf->entity.index * VI6_WPF_OFFSET, data);
+        vsp1_mod_write(&wpf->entity,
+                       reg + wpf->entity.index * VI6_WPF_OFFSET, data);
 }
 
 /* -----------------------------------------------------------------------------
@@ -88,7 +88,8 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
 
         if (!enable) {
                 vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0);
-                vsp1_wpf_write(wpf, VI6_WPF_SRCRPF, 0);
+                vsp1_write(vsp1, wpf->entity.index * VI6_WPF_OFFSET +
+                           VI6_WPF_SRCRPF, 0);
                 return 0;
         }
 
@@ -97,9 +98,12 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
          * inputs as sub-layers and select the virtual RPF as the master
          * layer.
          */
-        for (i = 0; i < pipe->num_inputs; ++i) {
+        for (i = 0; i < vsp1->info->rpf_count; ++i) {
                 struct vsp1_rwpf *input = pipe->inputs[i];
 
+                if (!input)
+                        continue;
+
                 srcrpf |= (!pipe->bru && pipe->num_inputs == 1)
                         ? VI6_WPF_SRCRPF_RPF_ACT_MST(input->entity.index)
                         : VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);
@@ -112,7 +116,7 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
 
         /* Destination stride. */
         if (!pipe->lif) {
-                struct v4l2_pix_format_mplane *format = &wpf->video.format;
+                struct v4l2_pix_format_mplane *format = &wpf->format;
 
                 vsp1_wpf_write(wpf, VI6_WPF_DSTM_STRIDE_Y,
                                format->plane_fmt[0].bytesperline);
@@ -130,7 +134,7 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
 
         /* Format */
         if (!pipe->lif) {
-                const struct vsp1_format_info *fmtinfo = wpf->video.fmtinfo;
+                const struct vsp1_format_info *fmtinfo = wpf->fmtinfo;
 
                 outfmt = fmtinfo->hwfmt << VI6_WPF_OUTFMT_WRFMT_SHIFT;
 
@@ -151,15 +155,17 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
         /* Take the control handler lock to ensure that the PDV value won't be
          * changed behind our back by a set control operation.
          */
-        mutex_lock(wpf->ctrls.lock);
-        outfmt |= vsp1_wpf_read(wpf, VI6_WPF_OUTFMT) & VI6_WPF_OUTFMT_PDV_MASK;
+        if (vsp1->info->uapi)
+                mutex_lock(wpf->ctrls.lock);
+        outfmt |= wpf->alpha->cur.val << VI6_WPF_OUTFMT_PDV_SHIFT;
         vsp1_wpf_write(wpf, VI6_WPF_OUTFMT, outfmt);
-        mutex_unlock(wpf->ctrls.lock);
+        if (vsp1->info->uapi)
+                mutex_unlock(wpf->ctrls.lock);
 
-        vsp1_write(vsp1, VI6_DPR_WPF_FPORCH(wpf->entity.index),
-                   VI6_DPR_WPF_FPORCH_FP_WPFN);
+        vsp1_mod_write(&wpf->entity, VI6_DPR_WPF_FPORCH(wpf->entity.index),
+                       VI6_DPR_WPF_FPORCH_FP_WPFN);
 
-        vsp1_write(vsp1, VI6_WPF_WRBCK_CTRL, 0);
+        vsp1_mod_write(&wpf->entity, VI6_WPF_WRBCK_CTRL, 0);
 
         /* Enable interrupts */
         vsp1_write(vsp1, VI6_WPF_IRQ_STA(wpf->entity.index), 0);
@@ -195,20 +201,17 @@ static struct v4l2_subdev_ops wpf_ops = {
  * Video Device Operations
  */
 
-static void wpf_vdev_queue(struct vsp1_video *video,
-                           struct vsp1_video_buffer *buf)
+static void wpf_set_memory(struct vsp1_rwpf *wpf, struct vsp1_rwpf_memory *mem)
 {
-        struct vsp1_rwpf *wpf = container_of(video, struct vsp1_rwpf, video);
-
-        vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_Y, buf->addr[0]);
-        if (buf->buf.vb2_buf.num_planes > 1)
-                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C0, buf->addr[1]);
-        if (buf->buf.vb2_buf.num_planes > 2)
-                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C1, buf->addr[2]);
+        vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_Y, mem->addr[0]);
+        if (mem->num_planes > 1)
+                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C0, mem->addr[1]);
+        if (mem->num_planes > 2)
+                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C1, mem->addr[2]);
 }
 
-static const struct vsp1_video_operations wpf_vdev_ops = {
-        .queue = wpf_vdev_queue,
+static const struct vsp1_rwpf_operations wpf_vdev_ops = {
+        .set_memory = wpf_set_memory,
 };
 
 /* -----------------------------------------------------------------------------
@@ -218,7 +221,6 @@ static const struct vsp1_video_operations wpf_vdev_ops = {
 struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
 {
         struct v4l2_subdev *subdev;
-        struct vsp1_video *video;
         struct vsp1_rwpf *wpf;
         int ret;
 
@@ -226,6 +228,8 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
         if (wpf == NULL)
                 return ERR_PTR(-ENOMEM);
 
+        wpf->ops = &wpf_vdev_ops;
+
         wpf->max_width = WPF_MAX_WIDTH;
         wpf->max_height = WPF_MAX_HEIGHT;
 
@@ -240,7 +244,7 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
         subdev = &wpf->entity.subdev;
         v4l2_subdev_init(subdev, &wpf_ops);
 
-        subdev->entity.ops = &vsp1_media_ops;
+        subdev->entity.ops = &vsp1->media_ops;
         subdev->internal_ops = &vsp1_subdev_internal_ops;
         snprintf(subdev->name, sizeof(subdev->name), "%s wpf.%u",
                  dev_name(vsp1->dev), index);
@@ -251,8 +255,9 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
 
         /* Initialize the control handler. */
         v4l2_ctrl_handler_init(&wpf->ctrls, 1);
-        v4l2_ctrl_new_std(&wpf->ctrls, &wpf_ctrl_ops, V4L2_CID_ALPHA_COMPONENT,
-                          0, 255, 1, 255);
+        wpf->alpha = v4l2_ctrl_new_std(&wpf->ctrls, &wpf_ctrl_ops,
+                                       V4L2_CID_ALPHA_COMPONENT,
+                                       0, 255, 1, 255);
 
         wpf->entity.subdev.ctrl_handler = &wpf->ctrls;
 
@@ -263,48 +268,9 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
                 goto error;
         }
 
-        /* Initialize the video device. */
-        video = &wpf->video;
-
-        video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-        video->vsp1 = vsp1;
-        video->ops = &wpf_vdev_ops;
-
-        ret = vsp1_video_init(video, &wpf->entity);
-        if (ret < 0)
-                goto error;
-
-        wpf->entity.video = video;
-        wpf->entity.sink = &wpf->video.video.entity;
-
         return wpf;
 
 error:
         vsp1_entity_destroy(&wpf->entity);
         return ERR_PTR(ret);
 }
-
-/*
- * vsp1_wpf_create_links() - RPF pads links creation
- * @vsp1: Pointer to VSP1 device
- * @entity: Pointer to VSP1 entity
- *
- * return negative error code or zero on success
- */
-int vsp1_wpf_create_links(struct vsp1_device *vsp1,
-                               struct vsp1_entity *entity)
-{
-        struct vsp1_rwpf *wpf = to_rwpf(&entity->subdev);
-        unsigned int flags;
-
-        /* Connect the video device to the WPF. All connections are immutable
-         * except for the WPF0 source link if a LIF is present.
-         */
-        flags = MEDIA_LNK_FL_ENABLED;
-        if (!(vsp1->pdata.features & VSP1_HAS_LIF) || entity->index != 0)
-                flags |= MEDIA_LNK_FL_IMMUTABLE;
-
-        return media_create_pad_link(&wpf->entity.subdev.entity,
-                                     RWPF_PAD_SOURCE,
-                                     &wpf->video.video.entity, 0, flags);
-}
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index 859f0c08ee05..271f725b17e8 100644
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1530,11 +1530,11 @@ static int si476x_radio_probe(struct platform_device *pdev)
         if (si476x_core_has_diversity(radio->core)) {
                 si476x_ctrls[SI476X_IDX_DIVERSITY_MODE].def =
                         si476x_phase_diversity_mode_to_idx(radio->core->diversity_mode);
-                si476x_radio_add_new_custom(radio, SI476X_IDX_DIVERSITY_MODE);
+                rval = si476x_radio_add_new_custom(radio, SI476X_IDX_DIVERSITY_MODE);
                 if (rval < 0)
                         goto exit;
 
-                si476x_radio_add_new_custom(radio, SI476X_IDX_INTERCHIP_LINK);
+                rval = si476x_radio_add_new_custom(radio, SI476X_IDX_INTERCHIP_LINK);
                 if (rval < 0)
                         goto exit;
         }
diff --git a/drivers/media/radio/tea575x.c b/drivers/media/radio/tea575x.c
index 3e08475af579..4dc2067bce14 100644
--- a/drivers/media/radio/tea575x.c
+++ b/drivers/media/radio/tea575x.c
@@ -14,10 +14,6 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
 #include <linux/delay.h>
@@ -226,6 +222,7 @@ void snd_tea575x_set_freq(struct snd_tea575x *tea)
         snd_tea575x_write(tea, tea->val);
         tea->freq = snd_tea575x_val_to_freq(tea, tea->val);
 }
+EXPORT_SYMBOL(snd_tea575x_set_freq);
 
 /*
  * Linux Video interface
@@ -582,25 +579,11 @@ int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)
 
         return 0;
 }
+EXPORT_SYMBOL(snd_tea575x_init);
 
 void snd_tea575x_exit(struct snd_tea575x *tea)
 {
         video_unregister_device(&tea->vd);
         v4l2_ctrl_handler_free(tea->vd.ctrl_handler);
 }
-
-static int __init alsa_tea575x_module_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_tea575x_module_exit(void)
-{
-}
-
-module_init(alsa_tea575x_module_init)
-module_exit(alsa_tea575x_module_exit)
-
-EXPORT_SYMBOL(snd_tea575x_init);
 EXPORT_SYMBOL(snd_tea575x_exit);
-EXPORT_SYMBOL(snd_tea575x_set_freq);
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index ebc73b034249..3f9e6df7d837 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -68,7 +68,7 @@ MODULE_PARM_DESC(default_radio_region, "Region: 0=Europe/US, 1=Japan");
 /* RDS buffer blocks */
 static u32 default_rds_buf = 300;
 module_param(default_rds_buf, uint, 0444);
-MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
+MODULE_PARM_DESC(default_rds_buf, "RDS buffer entries");
 
 /* Radio Nr */
 static u32 radio_nr = -1;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 18adf580f502..c96da3aaf00b 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -80,17 +80,24 @@ static inline void nvt_clear_reg_bit(struct nvt_dev *nvt, u8 val, u8 reg)
 }
 
 /* enter extended function mode */
-static inline void nvt_efm_enable(struct nvt_dev *nvt)
+static inline int nvt_efm_enable(struct nvt_dev *nvt)
 {
+        if (!request_muxed_region(nvt->cr_efir, 2, NVT_DRIVER_NAME))
+                return -EBUSY;
+
         /* Enabling Extended Function Mode explicitly requires writing 2x */
         outb(EFER_EFM_ENABLE, nvt->cr_efir);
         outb(EFER_EFM_ENABLE, nvt->cr_efir);
+
+        return 0;
 }
 
 /* exit extended function mode */
 static inline void nvt_efm_disable(struct nvt_dev *nvt)
 {
         outb(EFER_EFM_DISABLE, nvt->cr_efir);
+
+        release_region(nvt->cr_efir, 2);
 }
 
 /*
@@ -100,8 +107,25 @@ static inline void nvt_efm_disable(struct nvt_dev *nvt)
  */
 static inline void nvt_select_logical_dev(struct nvt_dev *nvt, u8 ldev)
 {
-        outb(CR_LOGICAL_DEV_SEL, nvt->cr_efir);
-        outb(ldev, nvt->cr_efdr);
+        nvt_cr_write(nvt, ldev, CR_LOGICAL_DEV_SEL);
+}
+
+/* select and enable logical device with setting EFM mode*/
+static inline void nvt_enable_logical_dev(struct nvt_dev *nvt, u8 ldev)
+{
+        nvt_efm_enable(nvt);
+        nvt_select_logical_dev(nvt, ldev);
+        nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
+        nvt_efm_disable(nvt);
+}
+
+/* select and disable logical device with setting EFM mode*/
+static inline void nvt_disable_logical_dev(struct nvt_dev *nvt, u8 ldev)
+{
+        nvt_efm_enable(nvt);
+        nvt_select_logical_dev(nvt, ldev);
+        nvt_cr_write(nvt, LOGICAL_DEV_DISABLE, CR_LOGICAL_DEV_EN);
+        nvt_efm_disable(nvt);
 }
 
 /* write val to cir config register */
@@ -137,6 +161,22 @@ static u8 nvt_cir_wake_reg_read(struct nvt_dev *nvt, u8 offset)
         return val;
 }
 
+/* don't override io address if one is set already */
+static void nvt_set_ioaddr(struct nvt_dev *nvt, unsigned long *ioaddr)
+{
+        unsigned long old_addr;
+
+        old_addr = nvt_cr_read(nvt, CR_CIR_BASE_ADDR_HI) << 8;
+        old_addr |= nvt_cr_read(nvt, CR_CIR_BASE_ADDR_LO);
+
+        if (old_addr)
+                *ioaddr = old_addr;
+        else {
+                nvt_cr_write(nvt, *ioaddr >> 8, CR_CIR_BASE_ADDR_HI);
+                nvt_cr_write(nvt, *ioaddr & 0xff, CR_CIR_BASE_ADDR_LO);
+        }
+}
+
 /* dump current cir register contents */
 static void cir_dump_regs(struct nvt_dev *nvt)
 {
@@ -251,7 +291,7 @@ static inline const char *nvt_find_chip(struct nvt_dev *nvt, int id)
 
 
 /* detect hardware features */
-static void nvt_hw_detect(struct nvt_dev *nvt)
+static int nvt_hw_detect(struct nvt_dev *nvt)
 {
         const char *chip_name;
         int chip_id;
@@ -266,10 +306,17 @@ static void nvt_hw_detect(struct nvt_dev *nvt)
                 nvt_efm_enable(nvt);
                 nvt->chip_major = nvt_cr_read(nvt, CR_CHIP_ID_HI);
         }
-
         nvt->chip_minor = nvt_cr_read(nvt, CR_CHIP_ID_LO);
 
+        nvt_efm_disable(nvt);
+
         chip_id = nvt->chip_major << 8 | nvt->chip_minor;
+        if (chip_id == NVT_INVALID) {
+                dev_err(&nvt->pdev->dev,
+                        "No device found on either EFM port\n");
+                return -ENODEV;
+        }
+
         chip_name = nvt_find_chip(nvt, chip_id);
 
         /* warn, but still let the driver load, if we don't know this chip */
@@ -282,7 +329,7 @@ static void nvt_hw_detect(struct nvt_dev *nvt)
                          "found %s or compatible: chip id: 0x%02x 0x%02x",
                          chip_name, nvt->chip_major, nvt->chip_minor);
 
-        nvt_efm_disable(nvt);
+        return 0;
 }
 
 static void nvt_cir_ldev_init(struct nvt_dev *nvt)
@@ -305,12 +352,10 @@ static void nvt_cir_ldev_init(struct nvt_dev *nvt)
         val |= psval;
         nvt_cr_write(nvt, val, psreg);
 
-        /* Select CIR logical device and enable */
+        /* Select CIR logical device */
         nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
 
-        nvt_cr_write(nvt, nvt->cir_addr >> 8, CR_CIR_BASE_ADDR_HI);
-        nvt_cr_write(nvt, nvt->cir_addr & 0xff, CR_CIR_BASE_ADDR_LO);
+        nvt_set_ioaddr(nvt, &nvt->cir_addr);
 
         nvt_cr_write(nvt, nvt->cir_irq, CR_CIR_IRQ_RSRC);
 
@@ -320,7 +365,7 @@ static void nvt_cir_ldev_init(struct nvt_dev *nvt)
 
 static void nvt_cir_wake_ldev_init(struct nvt_dev *nvt)
 {
-        /* Select ACPI logical device, enable it and CIR Wake */
+        /* Select ACPI logical device and anable it */
         nvt_select_logical_dev(nvt, LOGICAL_DEV_ACPI);
         nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
 
@@ -330,12 +375,10 @@ static void nvt_cir_wake_ldev_init(struct nvt_dev *nvt)
         /* enable pme interrupt of cir wakeup event */
         nvt_set_reg_bit(nvt, PME_INTR_CIR_PASS_BIT, CR_ACPI_IRQ_EVENTS2);
 
-        /* Select CIR Wake logical device and enable */
+        /* Select CIR Wake logical device */
         nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR_WAKE);
-        nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
 
-        nvt_cr_write(nvt, nvt->cir_wake_addr >> 8, CR_CIR_BASE_ADDR_HI);
-        nvt_cr_write(nvt, nvt->cir_wake_addr & 0xff, CR_CIR_BASE_ADDR_LO);
+        nvt_set_ioaddr(nvt, &nvt->cir_wake_addr);
 
         nvt_cr_write(nvt, nvt->cir_wake_irq, CR_CIR_IRQ_RSRC);
 
@@ -355,11 +398,19 @@ static void nvt_clear_cir_fifo(struct nvt_dev *nvt)
 /* clear out the hardware's cir wake rx fifo */
 static void nvt_clear_cir_wake_fifo(struct nvt_dev *nvt)
 {
-        u8 val;
+        u8 val, config;
+
+        config = nvt_cir_wake_reg_read(nvt, CIR_WAKE_IRCON);
+
+        /* clearing wake fifo works in learning mode only */
+        nvt_cir_wake_reg_write(nvt, config & ~CIR_WAKE_IRCON_MODE0,
+                               CIR_WAKE_IRCON);
 
         val = nvt_cir_wake_reg_read(nvt, CIR_WAKE_FIFOCON);
         nvt_cir_wake_reg_write(nvt, val | CIR_WAKE_FIFOCON_RXFIFOCLR,
                                CIR_WAKE_FIFOCON);
+
+        nvt_cir_wake_reg_write(nvt, config, CIR_WAKE_IRCON);
 }
 
 /* clear out the hardware's cir tx fifo */
@@ -408,6 +459,9 @@ static void nvt_cir_regs_init(struct nvt_dev *nvt)
 
         /* and finally, enable interrupts */
         nvt_set_cir_iren(nvt);
+
+        /* enable the CIR logical device */
+        nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR);
 }
 
 static void nvt_cir_wake_regs_init(struct nvt_dev *nvt)
@@ -442,10 +496,15 @@ static void nvt_cir_wake_regs_init(struct nvt_dev *nvt)
 
         /* clear any and all stray interrupts */
         nvt_cir_wake_reg_write(nvt, 0xff, CIR_WAKE_IRSTS);
+
+        /* enable the CIR WAKE logical device */
+        nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR_WAKE);
 }
 
 static void nvt_enable_wake(struct nvt_dev *nvt)
 {
+        unsigned long flags;
+
         nvt_efm_enable(nvt);
 
         nvt_select_logical_dev(nvt, LOGICAL_DEV_ACPI);
@@ -457,12 +516,16 @@ static void nvt_enable_wake(struct nvt_dev *nvt)
 
         nvt_efm_disable(nvt);
 
+        spin_lock_irqsave(&nvt->nvt_lock, flags);
+
         nvt_cir_wake_reg_write(nvt, CIR_WAKE_IRCON_MODE0 | CIR_WAKE_IRCON_RXEN |
                                CIR_WAKE_IRCON_R | CIR_WAKE_IRCON_RXINV |
                                CIR_WAKE_IRCON_SAMPLE_PERIOD_SEL,
                                CIR_WAKE_IRCON);
         nvt_cir_wake_reg_write(nvt, 0xff, CIR_WAKE_IRSTS);
         nvt_cir_wake_reg_write(nvt, 0, CIR_WAKE_IREN);
+
+        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 }
 
 #if 0 /* Currently unused */
@@ -670,7 +733,6 @@ static void nvt_handle_rx_fifo_overrun(struct nvt_dev *nvt)
 /* copy data from hardware rx fifo into driver buffer */
 static void nvt_get_rx_ir_data(struct nvt_dev *nvt)
 {
-        unsigned long flags;
         u8 fifocount, val;
         unsigned int b_idx;
         bool overrun = false;
@@ -689,8 +751,6 @@ static void nvt_get_rx_ir_data(struct nvt_dev *nvt)
 
         nvt_dbg("attempting to fetch %u bytes from hw rx fifo", fifocount);
 
-        spin_lock_irqsave(&nvt->nvt_lock, flags);
-
         b_idx = nvt->pkts;
 
         /* This should never happen, but lets check anyway... */
@@ -712,8 +772,6 @@ static void nvt_get_rx_ir_data(struct nvt_dev *nvt)
 
         if (overrun)
                 nvt_handle_rx_fifo_overrun(nvt);
-
-        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 }
 
 static void nvt_cir_log_irqs(u8 status, u8 iren)
@@ -736,16 +794,13 @@ static void nvt_cir_log_irqs(u8 status, u8 iren)
 static bool nvt_cir_tx_inactive(struct nvt_dev *nvt)
 {
         unsigned long flags;
-        bool tx_inactive;
         u8 tx_state;
 
         spin_lock_irqsave(&nvt->tx.lock, flags);
         tx_state = nvt->tx.tx_state;
         spin_unlock_irqrestore(&nvt->tx.lock, flags);
 
-        tx_inactive = (tx_state == ST_TX_NONE);
-
-        return tx_inactive;
+        return tx_state == ST_TX_NONE;
 }
 
 /* interrupt service routine for incoming and outgoing CIR data */
@@ -757,9 +812,7 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
 
         nvt_dbg_verbose("%s firing", __func__);
 
-        nvt_efm_enable(nvt);
-        nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_efm_disable(nvt);
+        spin_lock_irqsave(&nvt->nvt_lock, flags);
 
         /*
          * Get IR Status register contents. Write 1 to ack/clear
@@ -775,9 +828,14 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
          *   0: CIR_IRSTS_GH  - Min Length Detected
          */
         status = nvt_cir_reg_read(nvt, CIR_IRSTS);
-        if (!status) {
+        iren = nvt_cir_reg_read(nvt, CIR_IREN);
+
+        /* IRQ may be shared with CIR WAKE, therefore check for each
+         * status bit whether the related interrupt source is enabled
+         */
+        if (!(status & iren)) {
+                spin_unlock_irqrestore(&nvt->nvt_lock, flags);
                 nvt_dbg_verbose("%s exiting, IRSTS 0x0", __func__);
-                nvt_cir_reg_write(nvt, 0xff, CIR_IRSTS);
                 return IRQ_NONE;
         }
 
@@ -785,13 +843,6 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
         nvt_cir_reg_write(nvt, status, CIR_IRSTS);
         nvt_cir_reg_write(nvt, 0, CIR_IRSTS);
 
-        /* Interrupt may be shared with CIR Wake, bail if CIR not enabled */
-        iren = nvt_cir_reg_read(nvt, CIR_IREN);
-        if (!iren) {
-                nvt_dbg_verbose("%s exiting, CIR not enabled", __func__);
-                return IRQ_NONE;
-        }
-
         nvt_cir_log_irqs(status, iren);
 
         if (status & CIR_IRSTS_RTR) {
@@ -805,16 +856,14 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
                 if (nvt_cir_tx_inactive(nvt))
                         nvt_get_rx_ir_data(nvt);
 
-                spin_lock_irqsave(&nvt->nvt_lock, flags);
-
                 cur_state = nvt->study_state;
 
-                spin_unlock_irqrestore(&nvt->nvt_lock, flags);
-
                 if (cur_state == ST_STUDY_NONE)
                         nvt_clear_cir_fifo(nvt);
         }
 
+        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
+
         if (status & CIR_IRSTS_TE)
                 nvt_clear_tx_fifo(nvt);
 
@@ -863,9 +912,18 @@ static irqreturn_t nvt_cir_wake_isr(int irq, void *data)
 
         nvt_dbg_wake("%s firing", __func__);
 
+        spin_lock_irqsave(&nvt->nvt_lock, flags);
+
         status = nvt_cir_wake_reg_read(nvt, CIR_WAKE_IRSTS);
-        if (!status)
+        iren = nvt_cir_wake_reg_read(nvt, CIR_WAKE_IREN);
+
+        /* IRQ may be shared with CIR, therefore check for each
+         * status bit whether the related interrupt source is enabled
+         */
+        if (!(status & iren)) {
+                spin_unlock_irqrestore(&nvt->nvt_lock, flags);
                 return IRQ_NONE;
+        }
 
         if (status & CIR_WAKE_IRSTS_IR_PENDING)
                 nvt_clear_cir_wake_fifo(nvt);
@@ -873,13 +931,6 @@ static irqreturn_t nvt_cir_wake_isr(int irq, void *data)
         nvt_cir_wake_reg_write(nvt, status, CIR_WAKE_IRSTS);
         nvt_cir_wake_reg_write(nvt, 0, CIR_WAKE_IRSTS);
 
-        /* Interrupt may be shared with CIR, bail if Wake not enabled */
-        iren = nvt_cir_wake_reg_read(nvt, CIR_WAKE_IREN);
-        if (!iren) {
-                nvt_dbg_wake("%s exiting, wake not enabled", __func__);
-                return IRQ_HANDLED;
-        }
-
         if ((status & CIR_WAKE_IRSTS_PE) &&
             (nvt->wake_state == ST_WAKE_START)) {
                 while (nvt_cir_wake_reg_read(nvt, CIR_WAKE_RD_FIFO_ONLY_IDX)) {
@@ -888,39 +939,21 @@ static irqreturn_t nvt_cir_wake_isr(int irq, void *data)
                 }
 
                 nvt_cir_wake_reg_write(nvt, 0, CIR_WAKE_IREN);
-                spin_lock_irqsave(&nvt->nvt_lock, flags);
                 nvt->wake_state = ST_WAKE_FINISH;
-                spin_unlock_irqrestore(&nvt->nvt_lock, flags);
         }
 
+        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
+
         nvt_dbg_wake("%s done", __func__);
         return IRQ_HANDLED;
 }
 
-static void nvt_enable_cir(struct nvt_dev *nvt)
+static void nvt_disable_cir(struct nvt_dev *nvt)
 {
-        /* set function enable flags */
-        nvt_cir_reg_write(nvt, CIR_IRCON_TXEN | CIR_IRCON_RXEN |
-                          CIR_IRCON_RXINV | CIR_IRCON_SAMPLE_PERIOD_SEL,
-                          CIR_IRCON);
-
-        nvt_efm_enable(nvt);
-
-        /* enable the CIR logical device */
-        nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
-
-        nvt_efm_disable(nvt);
-
-        /* clear all pending interrupts */
-        nvt_cir_reg_write(nvt, 0xff, CIR_IRSTS);
+        unsigned long flags;
 
-        /* enable interrupts */
-        nvt_set_cir_iren(nvt);
-}
+        spin_lock_irqsave(&nvt->nvt_lock, flags);
 
-static void nvt_disable_cir(struct nvt_dev *nvt)
-{
         /* disable CIR interrupts */
         nvt_cir_reg_write(nvt, 0, CIR_IREN);
 
@@ -934,13 +967,10 @@ static void nvt_disable_cir(struct nvt_dev *nvt)
         nvt_clear_cir_fifo(nvt);
         nvt_clear_tx_fifo(nvt);
 
-        nvt_efm_enable(nvt);
+        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 
         /* disable the CIR logical device */
-        nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_cr_write(nvt, LOGICAL_DEV_DISABLE, CR_LOGICAL_DEV_EN);
-
-        nvt_efm_disable(nvt);
+        nvt_disable_logical_dev(nvt, LOGICAL_DEV_CIR);
 }
 
 static int nvt_open(struct rc_dev *dev)
@@ -949,20 +979,31 @@ static int nvt_open(struct rc_dev *dev)
         unsigned long flags;
 
         spin_lock_irqsave(&nvt->nvt_lock, flags);
-        nvt_enable_cir(nvt);
+
+        /* set function enable flags */
+        nvt_cir_reg_write(nvt, CIR_IRCON_TXEN | CIR_IRCON_RXEN |
+                          CIR_IRCON_RXINV | CIR_IRCON_SAMPLE_PERIOD_SEL,
+                          CIR_IRCON);
+
+        /* clear all pending interrupts */
+        nvt_cir_reg_write(nvt, 0xff, CIR_IRSTS);
+
+        /* enable interrupts */
+        nvt_set_cir_iren(nvt);
+
         spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 
+        /* enable the CIR logical device */
+        nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR);
+
         return 0;
 }
 
 static void nvt_close(struct rc_dev *dev)
 {
         struct nvt_dev *nvt = dev->priv;
-        unsigned long flags;
 
-        spin_lock_irqsave(&nvt->nvt_lock, flags);
         nvt_disable_cir(nvt);
-        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 }
 
 /* Allocate memory, probe hardware, and initialize everything */
@@ -1024,7 +1065,9 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         init_waitqueue_head(&nvt->tx.queue);
 
-        nvt_hw_detect(nvt);
+        ret = nvt_hw_detect(nvt);
+        if (ret)
+                goto exit_free_dev_rdev;
 
         /* Initialize CIR & CIR Wake Logical Devices */
         nvt_efm_enable(nvt);
@@ -1032,7 +1075,10 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         nvt_cir_wake_ldev_init(nvt);
         nvt_efm_disable(nvt);
 
-        /* Initialize CIR & CIR Wake Config Registers */
+        /*
+         * Initialize CIR & CIR Wake Config Registers
+         * and enable logical devices
+         */
         nvt_cir_regs_init(nvt);
         nvt_cir_wake_regs_init(nvt);
 
@@ -1079,12 +1125,12 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
                 goto exit_unregister_device;
 
         if (!devm_request_region(&pdev->dev, nvt->cir_wake_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME "-wake"))
                 goto exit_unregister_device;
 
         if (devm_request_irq(&pdev->dev, nvt->cir_wake_irq,
                              nvt_cir_wake_isr, IRQF_SHARED,
-                             NVT_DRIVER_NAME, (void *)nvt))
+                             NVT_DRIVER_NAME "-wake", (void *)nvt))
                 goto exit_unregister_device;
 
         device_init_wakeup(&pdev->dev, true);
@@ -1109,15 +1155,11 @@ exit_free_dev_rdev:
 static void nvt_remove(struct pnp_dev *pdev)
 {
         struct nvt_dev *nvt = pnp_get_drvdata(pdev);
-        unsigned long flags;
 
-        spin_lock_irqsave(&nvt->nvt_lock, flags);
-        /* disable CIR */
-        nvt_cir_reg_write(nvt, 0, CIR_IREN);
         nvt_disable_cir(nvt);
+
         /* enable CIR Wake (for IR power-on) */
         nvt_enable_wake(nvt);
-        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 
         rc_unregister_device(nvt->rdev);
 }
@@ -1129,26 +1171,23 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state)
 
         nvt_dbg("%s called", __func__);
 
-        /* zero out misc state tracking */
-        spin_lock_irqsave(&nvt->nvt_lock, flags);
-        nvt->study_state = ST_STUDY_NONE;
-        nvt->wake_state = ST_WAKE_NONE;
-        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
-
         spin_lock_irqsave(&nvt->tx.lock, flags);
         nvt->tx.tx_state = ST_TX_NONE;
         spin_unlock_irqrestore(&nvt->tx.lock, flags);
 
+        spin_lock_irqsave(&nvt->nvt_lock, flags);
+
+        /* zero out misc state tracking */
+        nvt->study_state = ST_STUDY_NONE;
+        nvt->wake_state = ST_WAKE_NONE;
+
         /* disable all CIR interrupts */
         nvt_cir_reg_write(nvt, 0, CIR_IREN);
 
-        nvt_efm_enable(nvt);
+        spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 
         /* disable cir logical dev */
-        nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_cr_write(nvt, LOGICAL_DEV_DISABLE, CR_LOGICAL_DEV_EN);
-
-        nvt_efm_disable(nvt);
+        nvt_disable_logical_dev(nvt, LOGICAL_DEV_CIR);
 
         /* make sure wake is enabled */
         nvt_enable_wake(nvt);
@@ -1162,16 +1201,6 @@ static int nvt_resume(struct pnp_dev *pdev)
 
         nvt_dbg("%s called", __func__);
 
-        /* open interrupt */
-        nvt_set_cir_iren(nvt);
-
-        /* Enable CIR logical device */
-        nvt_efm_enable(nvt);
-        nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
-        nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
-
-        nvt_efm_disable(nvt);
-
         nvt_cir_regs_init(nvt);
         nvt_cir_wake_regs_init(nvt);
 
@@ -1181,6 +1210,7 @@ static int nvt_resume(struct pnp_dev *pdev)
 static void nvt_shutdown(struct pnp_dev *pdev)
 {
         struct nvt_dev *nvt = pnp_get_drvdata(pdev);
+
         nvt_enable_wake(nvt);
 }
 
diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
index 0ad15d34e9c9..4a5650dffa29 100644
--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -68,7 +68,8 @@ enum nvt_chip_ver {
         NVT_W83667HG    = 0xa510,
         NVT_6775F       = 0xb470,
         NVT_6776F       = 0xc330,
-        NVT_6779D       = 0xc560
+        NVT_6779D       = 0xc560,
+        NVT_INVALID     = 0xffff,
 };
 
 struct nvt_chip {
@@ -157,8 +158,8 @@ struct nvt_dev {
 /* total length of CIR and CIR WAKE */
 #define CIR_IOREG_LENGTH        0x0f
 
-/* RX limit length, 8 high bits for SLCH, 8 low bits for SLCL (0x7d0 = 2000) */
-#define CIR_RX_LIMIT_COUNT      0x7d0
+/* RX limit length, 8 high bits for SLCH, 8 low bits for SLCL */
+#define CIR_RX_LIMIT_COUNT  (IR_DEFAULT_TIMEOUT / US_TO_NS(SAMPLE_PERIOD))
 
 /* CIR Regs */
 #define CIR_IRCON       0x00
@@ -292,10 +293,7 @@ struct nvt_dev {
 #define CIR_WAKE_IREN_RTR               0x40
 #define CIR_WAKE_IREN_PE                0x20
 #define CIR_WAKE_IREN_RFO               0x10
-#define CIR_WAKE_IREN_TE                0x08
-#define CIR_WAKE_IREN_TTR               0x04
-#define CIR_WAKE_IREN_TFU               0x02
-#define CIR_WAKE_IREN_GH                0x01
+#define CIR_WAKE_IREN_GH                0x08
 
 /* CIR WAKE FIFOCON settings */
 #define CIR_WAKE_FIFOCON_RXFIFOCLR      0x08
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 7359f3d03b64..585d5e52118d 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -16,6 +16,9 @@
 #ifndef _RC_CORE_PRIV
 #define _RC_CORE_PRIV
 
+/* Define the max number of pulse/space transitions to buffer */
+#define MAX_IR_EVENT_SIZE       512
+
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <media/rc-core.h>
@@ -35,7 +38,8 @@ struct ir_raw_event_ctrl {
         struct list_head                list;           /* to keep track of raw clients */
         struct task_struct              *thread;
         spinlock_t                      lock;
-        struct kfifo_rec_ptr_1          kfifo;          /* fifo for the pulse/space durations */
+        /* fifo for the pulse/space durations */
+        DECLARE_KFIFO(kfifo, struct ir_raw_event, MAX_IR_EVENT_SIZE);
         ktime_t                         last_event;     /* when last event occurred */
         enum raw_event_type             last_type;      /* last event type */
         struct rc_dev                   *dev;           /* pointer to the parent rc_dev */
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index c69807fe2fef..144304c94606 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -20,9 +20,6 @@
 #include <linux/freezer.h>
 #include "rc-core-priv.h"
 
-/* Define the max number of pulse/space transitions to buffer */
-#define MAX_IR_EVENT_SIZE      512
-
 /* Used to keep track of IR raw clients, protected by ir_raw_handler_lock */
 static LIST_HEAD(ir_raw_client_list);
 
@@ -36,14 +33,12 @@ static int ir_raw_event_thread(void *data)
         struct ir_raw_event ev;
         struct ir_raw_handler *handler;
         struct ir_raw_event_ctrl *raw = (struct ir_raw_event_ctrl *)data;
-        int retval;
 
         while (!kthread_should_stop()) {
 
                 spin_lock_irq(&raw->lock);
-                retval = kfifo_len(&raw->kfifo);
 
-                if (retval < sizeof(ev)) {
+                if (!kfifo_len(&raw->kfifo)) {
                         set_current_state(TASK_INTERRUPTIBLE);
 
                         if (kthread_should_stop())
@@ -54,7 +49,8 @@ static int ir_raw_event_thread(void *data)
                         continue;
                 }
 
-                retval = kfifo_out(&raw->kfifo, &ev, sizeof(ev));
+                if(!kfifo_out(&raw->kfifo, &ev, 1))
+                        dev_err(&raw->dev->dev, "IR event FIFO is empty!\n");
                 spin_unlock_irq(&raw->lock);
 
                 mutex_lock(&ir_raw_handler_lock);
@@ -87,8 +83,10 @@ int ir_raw_event_store(struct rc_dev *dev, struct ir_raw_event *ev)
         IR_dprintk(2, "sample: (%05dus %s)\n",
                    TO_US(ev->duration), TO_STR(ev->pulse));
 
-        if (kfifo_in(&dev->raw->kfifo, ev, sizeof(*ev)) != sizeof(*ev))
-                return -ENOMEM;
+        if (!kfifo_put(&dev->raw->kfifo, *ev)) {
+                dev_err(&dev->dev, "IR event FIFO is full!\n");
+                return -ENOSPC;
+        }
 
         return 0;
 }
@@ -273,11 +271,7 @@ int ir_raw_event_register(struct rc_dev *dev)
 
         dev->raw->dev = dev;
         dev->change_protocol = change_protocol;
-        rc = kfifo_alloc(&dev->raw->kfifo,
-                         sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
-                         GFP_KERNEL);
-        if (rc < 0)
-                goto out;
+        INIT_KFIFO(dev->raw->kfifo);
 
         spin_lock_init(&dev->raw->lock);
         dev->raw->thread = kthread_run(ir_raw_event_thread, dev->raw,
@@ -319,7 +313,6 @@ void ir_raw_event_unregister(struct rc_dev *dev)
                         handler->raw_unregister(dev);
         mutex_unlock(&ir_raw_handler_lock);
 
-        kfifo_free(&dev->raw->kfifo);
         kfree(dev->raw);
         dev->raw = NULL;
 }
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 1042fa331a07..dcf20d9cbe09 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -723,12 +723,18 @@ int rc_open(struct rc_dev *rdev)
                 return -EINVAL;
 
         mutex_lock(&rdev->lock);
+        if (!rdev->initialized) {
+                rval = -EINVAL;
+                goto unlock;
+        }
+
         if (!rdev->users++ && rdev->open != NULL)
                 rval = rdev->open(rdev);
 
         if (rval)
                 rdev->users--;
 
+unlock:
         mutex_unlock(&rdev->lock);
 
         return rval;
@@ -874,6 +880,10 @@ static ssize_t show_protocols(struct device *device,
                 return -EINVAL;
 
         mutex_lock(&dev->lock);
+        if (!dev->initialized) {
+                mutex_unlock(&dev->lock);
+                return -EINVAL;
+        }
 
         if (fattr->type == RC_FILTER_NORMAL) {
                 enabled = dev->enabled_protocols;
@@ -1074,6 +1084,10 @@ static ssize_t store_protocols(struct device *device,
         }
 
         mutex_lock(&dev->lock);
+        if (!dev->initialized) {
+                rc = -EINVAL;
+                goto out;
+        }
 
         old_protocols = *current_protocols;
         new_protocols = old_protocols;
@@ -1154,12 +1168,17 @@ static ssize_t show_filter(struct device *device,
         if (!dev)
                 return -EINVAL;
 
+        mutex_lock(&dev->lock);
+        if (!dev->initialized) {
+                mutex_unlock(&dev->lock);
+                return -EINVAL;
+        }
+
         if (fattr->type == RC_FILTER_NORMAL)
                 filter = &dev->scancode_filter;
         else
                 filter = &dev->scancode_wakeup_filter;
 
-        mutex_lock(&dev->lock);
         if (fattr->mask)
                 val = filter->mask;
         else
@@ -1222,6 +1241,10 @@ static ssize_t store_filter(struct device *device,
                 return -EINVAL;
 
         mutex_lock(&dev->lock);
+        if (!dev->initialized) {
+                ret = -EINVAL;
+                goto unlock;
+        }
 
         new_filter = *filter;
         if (fattr->mask)
@@ -1419,14 +1442,6 @@ int rc_register_device(struct rc_dev *dev)
                 dev->sysfs_groups[attr++] = &rc_dev_wakeup_protocol_attr_grp;
         dev->sysfs_groups[attr++] = NULL;
 
-        /*
-         * Take the lock here, as the device sysfs node will appear
-         * when device_add() is called, which may trigger an ir-keytable udev
-         * rule, which will in turn call show_protocols and access
-         * dev->enabled_protocols before it has been initialized.
-         */
-        mutex_lock(&dev->lock);
-
         rc = device_add(&dev->dev);
         if (rc)
                 goto out_unlock;
@@ -1440,13 +1455,7 @@ int rc_register_device(struct rc_dev *dev)
         dev->input_dev->phys = dev->input_phys;
         dev->input_dev->name = dev->input_name;
 
-        /* input_register_device can call ir_open, so unlock mutex here */
-        mutex_unlock(&dev->lock);
-
         rc = input_register_device(dev->input_dev);
-
-        mutex_lock(&dev->lock);
-
         if (rc)
                 goto out_table;
 
@@ -1475,10 +1484,7 @@ int rc_register_device(struct rc_dev *dev)
                         request_module_nowait("ir-lirc-codec");
                         raw_init = true;
                 }
-                /* calls ir_register_device so unlock mutex here*/
-                mutex_unlock(&dev->lock);
                 rc = ir_raw_event_register(dev);
-                mutex_lock(&dev->lock);
                 if (rc < 0)
                         goto out_input;
         }
@@ -1491,6 +1497,8 @@ int rc_register_device(struct rc_dev *dev)
                 dev->enabled_protocols = rc_type;
         }
 
+        mutex_lock(&dev->lock);
+        dev->initialized = true;
         mutex_unlock(&dev->lock);
 
         IR_dprintk(1, "Registered rc%u (driver: %s, remote: %s, mode %s)\n",
@@ -1512,7 +1520,6 @@ out_table:
 out_dev:
         device_del(&dev->dev);
 out_unlock:
-        mutex_unlock(&dev->lock);
         ida_simple_remove(&rc_ida, minor);
         return rc;
 }
diff --git a/drivers/media/tuners/m88rs6000t.c b/drivers/media/tuners/m88rs6000t.c
index 504bfbc4027a..9f3e0fd4cad9 100644
--- a/drivers/media/tuners/m88rs6000t.c
+++ b/drivers/media/tuners/m88rs6000t.c
@@ -461,13 +461,12 @@ static int m88rs6000t_sleep(struct dvb_frontend *fe)
         dev_dbg(&dev->client->dev, "%s:\n", __func__);
 
         ret = regmap_write(dev->regmap, 0x07, 0x6d);
-        if (ret)
-                goto err;
-        usleep_range(5000, 10000);
-err:
-        if (ret)
+        if (ret) {
                 dev_dbg(&dev->client->dev, "failed=%d\n", ret);
-        return ret;
+                return ret;
+        }
+        usleep_range(5000, 10000);
+        return 0;
 }
 
 static int m88rs6000t_get_frequency(struct dvb_frontend *fe, u32 *frequency)
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index a7a8452e99d2..6ab35e315fe7 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -1295,7 +1295,7 @@ static int generic_set_freq(struct dvb_frontend *fe,
                             v4l2_std_id std, u32 delsys)
 {
         struct r820t_priv               *priv = fe->tuner_priv;
-        int                             rc = -EINVAL;
+        int                             rc;
         u32                             lo_freq;
 
         tuner_dbg("should set frequency to %d kHz, bw %d MHz\n",
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 0e1ca2b00e61..243ac3816028 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -364,8 +364,8 @@ static int si2157_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
 static const struct dvb_tuner_ops si2157_ops = {
         .info = {
                 .name           = "Silicon Labs Si2146/2147/2148/2157/2158",
-                .frequency_min  = 55000000,
-                .frequency_max  = 862000000,
+                .frequency_min  = 42000000,
+                .frequency_max  = 870000000,
         },
 
         .init = si2157_init,
@@ -403,7 +403,7 @@ err:
 }
 
 static int si2157_probe(struct i2c_client *client,
-                const struct i2c_device_id *id)
+                        const struct i2c_device_id *id)
 {
         struct si2157_config *cfg = client->dev.platform_data;
         struct dvb_frontend *fe = cfg->fe;
@@ -438,6 +438,31 @@ static int si2157_probe(struct i2c_client *client,
         memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops));
         fe->tuner_priv = client;
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+        if (cfg->mdev) {
+                dev->mdev = cfg->mdev;
+
+                dev->ent.name = KBUILD_MODNAME;
+                dev->ent.function = MEDIA_ENT_F_TUNER;
+
+                dev->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
+                dev->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
+                dev->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;
+
+                ret = media_entity_pads_init(&dev->ent, TUNER_NUM_PADS,
+                                             &dev->pad[0]);
+
+                if (ret)
+                        goto err_kfree;
+
+                ret = media_device_register_entity(cfg->mdev, &dev->ent);
+                if (ret) {
+                        media_entity_cleanup(&dev->ent);
+                        goto err_kfree;
+                }
+        }
+#endif
+
         dev_info(&client->dev, "Silicon Labs %s successfully attached\n",
                         dev->chiptype == SI2157_CHIPTYPE_SI2146 ?
                         "Si2146" : "Si2147/2148/2157/2158");
@@ -458,6 +483,14 @@ static int si2157_remove(struct i2c_client *client)
 
         dev_dbg(&client->dev, "\n");
 
+        /* stop statistics polling */
+        cancel_delayed_work_sync(&dev->stat_work);
+
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+        if (dev->mdev)
+                media_device_unregister_entity(&dev->ent);
+#endif
+
         memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
         fe->tuner_priv = NULL;
         kfree(dev);
diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h
index 4db97ab744d6..5f1a60bf7ced 100644
--- a/drivers/media/tuners/si2157.h
+++ b/drivers/media/tuners/si2157.h
@@ -18,6 +18,7 @@
 #define SI2157_H
 
 #include <linux/kconfig.h>
+#include <media/media-device.h>
 #include "dvb_frontend.h"
 
 /*
@@ -30,6 +31,10 @@ struct si2157_config {
          */
         struct dvb_frontend *fe;
 
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_device *mdev;
+#endif
+
         /*
          * Spectral Inversion
          */
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
index ecc463db8f69..589d558d381c 100644
--- a/drivers/media/tuners/si2157_priv.h
+++ b/drivers/media/tuners/si2157_priv.h
@@ -18,6 +18,7 @@
 #define SI2157_PRIV_H
 
 #include <linux/firmware.h>
+#include <media/v4l2-mc.h>
 #include "si2157.h"
 
 /* state struct */
@@ -31,6 +32,13 @@ struct si2157_dev {
         u8 if_port;
         u32 if_frequency;
         struct delayed_work stat_work;
+
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_device     *mdev;
+        struct media_entity     ent;
+        struct media_pad        pad[TUNER_NUM_PADS];
+#endif
+
 };
 
 #define SI2157_CHIPTYPE_SI2157 0
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 4e941f00b600..317ef63ee789 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -1403,11 +1403,14 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
          * in order to avoid troubles during device release.
          */
         kfree(priv->ctrl.fname);
+        priv->ctrl.fname = NULL;
         memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
         if (p->fname) {
                 priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
-                if (priv->ctrl.fname == NULL)
+                if (priv->ctrl.fname == NULL) {
                         rc = -ENOMEM;
+                        goto unlock;
+                }
         }
 
         /*
@@ -1439,6 +1442,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
                 } else
                         priv->state = XC2028_WAITING_FIRMWARE;
         }
+unlock:
         mutex_unlock(&priv->lock);
 
         return rc;
diff --git a/drivers/media/usb/as102/as102_drv.h b/drivers/media/usb/as102/as102_drv.h
index aee2d76e8dfc..8def19d9ab92 100644
--- a/drivers/media/usb/as102/as102_drv.h
+++ b/drivers/media/usb/as102/as102_drv.h
@@ -52,7 +52,7 @@ struct as10x_bus_adapter_t {
         struct as10x_cmd_t *cmd, *rsp;
 
         /* bus adapter private ops callback */
-        struct as102_priv_ops_t *ops;
+        const struct as102_priv_ops_t *ops;
 };
 
 struct as102_dev_t {
diff --git a/drivers/media/usb/as102/as102_usb_drv.c b/drivers/media/usb/as102/as102_usb_drv.c
index 3f669066ccf6..0e8030c071b8 100644
--- a/drivers/media/usb/as102/as102_usb_drv.c
+++ b/drivers/media/usb/as102/as102_usb_drv.c
@@ -189,7 +189,7 @@ static int as102_read_ep2(struct as10x_bus_adapter_t *bus_adap,
         return actual_len;
 }
 
-static struct as102_priv_ops_t as102_priv_ops = {
+static const struct as102_priv_ops_t as102_priv_ops = {
         .upload_fw_pkt  = as102_send_ep1,
         .xfer_cmd       = as102_usb_xfer_cmd,
         .as102_read_ep2 = as102_read_ep2,
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 9e29e70a78d7..7cafe4dd5fd1 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -143,7 +143,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
 #endif
 }
 
-static void au0828_usb_release(struct au0828_dev *dev)
+void au0828_usb_release(struct au0828_dev *dev)
 {
         au0828_unregister_media_device(dev);
 
@@ -153,33 +153,6 @@ static void au0828_usb_release(struct au0828_dev *dev)
         kfree(dev);
 }
 
-#ifdef CONFIG_VIDEO_AU0828_V4L2
-
-static void au0828_usb_v4l2_media_release(struct au0828_dev *dev)
-{
-#ifdef CONFIG_MEDIA_CONTROLLER
-        int i;
-
-        for (i = 0; i < AU0828_MAX_INPUT; i++) {
-                if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED)
-                        return;
-                media_device_unregister_entity(&dev->input_ent[i]);
-        }
-#endif
-}
-
-static void au0828_usb_v4l2_release(struct v4l2_device *v4l2_dev)
-{
-        struct au0828_dev *dev =
-                container_of(v4l2_dev, struct au0828_dev, v4l2_dev);
-
-        v4l2_ctrl_handler_free(&dev->v4l2_ctrl_hdl);
-        v4l2_device_unregister(&dev->v4l2_dev);
-        au0828_usb_v4l2_media_release(dev);
-        au0828_usb_release(dev);
-}
-#endif
-
 static void au0828_usb_disconnect(struct usb_interface *interface)
 {
         struct au0828_dev *dev = usb_get_intfdata(interface);
@@ -202,18 +175,13 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
         mutex_lock(&dev->mutex);
         dev->usbdev = NULL;
         mutex_unlock(&dev->mutex);
-#ifdef CONFIG_VIDEO_AU0828_V4L2
-        if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED) {
-                au0828_analog_unregister(dev);
-                v4l2_device_disconnect(&dev->v4l2_dev);
-                v4l2_device_put(&dev->v4l2_dev);
+        if (au0828_analog_unregister(dev)) {
                 /*
                  * No need to call au0828_usb_release() if V4L2 is enabled,
                  * as this is already called via au0828_usb_v4l2_release()
                  */
                 return;
         }
-#endif
         au0828_usb_release(dev);
 }
 
@@ -223,23 +191,12 @@ static int au0828_media_device_init(struct au0828_dev *dev,
 #ifdef CONFIG_MEDIA_CONTROLLER
         struct media_device *mdev;
 
-        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
-        if (!mdev)
-                return -ENOMEM;
-
-        mdev->dev = &udev->dev;
-
         if (!dev->board.name)
-                strlcpy(mdev->model, "unknown au0828", sizeof(mdev->model));
+                mdev = v4l2_mc_usb_media_device_init(udev, "unknown au0828");
         else
-                strlcpy(mdev->model, dev->board.name, sizeof(mdev->model));
-        if (udev->serial)
-                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
-        strcpy(mdev->bus_info, udev->devpath);
-        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
-        mdev->driver_version = LINUX_VERSION_CODE;
-
-        media_device_init(mdev);
+                mdev = v4l2_mc_usb_media_device_init(udev, dev->board.name);
+        if (!mdev)
+                return -ENOMEM;
 
         dev->media_dev = mdev;
 #endif
@@ -247,83 +204,6 @@ static int au0828_media_device_init(struct au0828_dev *dev,
 }
 
 
-static int au0828_create_media_graph(struct au0828_dev *dev)
-{
-#ifdef CONFIG_MEDIA_CONTROLLER
-        struct media_device *mdev = dev->media_dev;
-        struct media_entity *entity;
-        struct media_entity *tuner = NULL, *decoder = NULL;
-        int i, ret;
-
-        if (!mdev)
-                return 0;
-
-        media_device_for_each_entity(entity, mdev) {
-                switch (entity->function) {
-                case MEDIA_ENT_F_TUNER:
-                        tuner = entity;
-                        break;
-                case MEDIA_ENT_F_ATV_DECODER:
-                        decoder = entity;
-                        break;
-                }
-        }
-
-        /* Analog setup, using tuner as a link */
-
-        /* Something bad happened! */
-        if (!decoder)
-                return -EINVAL;
-
-        if (tuner) {
-                ret = media_create_pad_link(tuner, TUNER_PAD_IF_OUTPUT,
-                                            decoder, 0,
-                                            MEDIA_LNK_FL_ENABLED);
-                if (ret)
-                        return ret;
-        }
-        ret = media_create_pad_link(decoder, 1, &dev->vdev.entity, 0,
-                                    MEDIA_LNK_FL_ENABLED);
-        if (ret)
-                return ret;
-        ret = media_create_pad_link(decoder, 2, &dev->vbi_dev.entity, 0,
-                                    MEDIA_LNK_FL_ENABLED);
-        if (ret)
-                return ret;
-
-        for (i = 0; i < AU0828_MAX_INPUT; i++) {
-                struct media_entity *ent = &dev->input_ent[i];
-
-                if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED)
-                        break;
-
-                switch (AUVI_INPUT(i).type) {
-                case AU0828_VMUX_CABLE:
-                case AU0828_VMUX_TELEVISION:
-                case AU0828_VMUX_DVB:
-                        if (!tuner)
-                                break;
-
-                        ret = media_create_pad_link(ent, 0, tuner,
-                                                    TUNER_PAD_RF_INPUT,
-                                                    MEDIA_LNK_FL_ENABLED);
-                        if (ret)
-                                return ret;
-                        break;
-                case AU0828_VMUX_COMPOSITE:
-                case AU0828_VMUX_SVIDEO:
-                default: /* AU0828_VMUX_DEBUG */
-                        /* FIXME: fix the decoder PAD */
-                        ret = media_create_pad_link(ent, 0, decoder, 0, 0);
-                        if (ret)
-                                return ret;
-                        break;
-                }
-        }
-#endif
-        return 0;
-}
-
 static int au0828_usb_probe(struct usb_interface *interface,
         const struct usb_device_id *id)
 {
@@ -378,32 +258,13 @@ static int au0828_usb_probe(struct usb_interface *interface,
                 return retval;
         }
 
-#ifdef CONFIG_VIDEO_AU0828_V4L2
-        dev->v4l2_dev.release = au0828_usb_v4l2_release;
-
-        /* Create the v4l2_device */
-#ifdef CONFIG_MEDIA_CONTROLLER
-        dev->v4l2_dev.mdev = dev->media_dev;
-#endif
-        retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
+        retval = au0828_v4l2_device_register(interface, dev);
         if (retval) {
-                pr_err("%s() v4l2_device_register failed\n",
-                       __func__);
+                au0828_usb_v4l2_media_release(dev);
                 mutex_unlock(&dev->lock);
                 kfree(dev);
                 return retval;
         }
-        /* This control handler will inherit the controls from au8522 */
-        retval = v4l2_ctrl_handler_init(&dev->v4l2_ctrl_hdl, 4);
-        if (retval) {
-                pr_err("%s() v4l2_ctrl_handler_init failed\n",
-                       __func__);
-                mutex_unlock(&dev->lock);
-                kfree(dev);
-                return retval;
-        }
-        dev->v4l2_dev.ctrl_handler = &dev->v4l2_ctrl_hdl;
-#endif
 
         /* Power Up the bridge */
         au0828_write(dev, REG_600, 1 << 4);
@@ -417,11 +278,13 @@ static int au0828_usb_probe(struct usb_interface *interface,
         /* Setup */
         au0828_card_setup(dev);
 
-#ifdef CONFIG_VIDEO_AU0828_V4L2
         /* Analog TV */
-        if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
-                au0828_analog_register(dev, interface);
-#endif
+        retval = au0828_analog_register(dev, interface);
+        if (retval) {
+                pr_err("%s() au0282_dev_register failed to register on V4L2\n",
+                        __func__);
+                goto done;
+        }
 
         /* Digital TV */
         retval = au0828_dvb_register(dev);
@@ -443,13 +306,6 @@ static int au0828_usb_probe(struct usb_interface *interface,
 
         mutex_unlock(&dev->lock);
 
-        retval = au0828_create_media_graph(dev);
-        if (retval) {
-                pr_err("%s() au0282_dev_register failed to create graph\n",
-                       __func__);
-                goto done;
-        }
-
 #ifdef CONFIG_MEDIA_CONTROLLER
         retval = media_device_register(dev->media_dev);
 #endif
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c
index 94363a3ba400..0e174e860614 100644
--- a/drivers/media/usb/au0828/au0828-dvb.c
+++ b/drivers/media/usb/au0828/au0828-dvb.c
@@ -181,7 +181,7 @@ static int stop_urb_transfer(struct au0828_dev *dev)
 static int start_urb_transfer(struct au0828_dev *dev)
 {
         struct urb *purb;
-        int i, ret = -ENOMEM;
+        int i, ret;
 
         dprintk(2, "%s()\n", __func__);
 
@@ -194,7 +194,7 @@ static int start_urb_transfer(struct au0828_dev *dev)
 
                 dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL);
                 if (!dev->urbs[i])
-                        goto err;
+                        return -ENOMEM;
 
                 purb = dev->urbs[i];
 
@@ -207,9 +207,10 @@ static int start_urb_transfer(struct au0828_dev *dev)
                 if (!purb->transfer_buffer) {
                         usb_free_urb(purb);
                         dev->urbs[i] = NULL;
+                        ret = -ENOMEM;
                         pr_err("%s: failed big buffer allocation, err = %d\n",
                                __func__, ret);
-                        goto err;
+                        return ret;
                 }
 
                 purb->status = -EINPROGRESS;
@@ -235,10 +236,7 @@ static int start_urb_transfer(struct au0828_dev *dev)
         }
 
         dev->urb_streaming = true;
-        ret = 0;
-
-err:
-        return ret;
+        return 0;
 }
 
 static void au0828_start_transport(struct au0828_dev *dev)
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 8c54fd21022e..2fc2b29d2dd9 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -638,6 +638,142 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
         return rc;
 }
 
+void au0828_usb_v4l2_media_release(struct au0828_dev *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        int i;
+
+        for (i = 0; i < AU0828_MAX_INPUT; i++) {
+                if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED)
+                        return;
+                media_device_unregister_entity(&dev->input_ent[i]);
+        }
+#endif
+}
+
+static int au0828_create_media_graph(struct au0828_dev *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev = dev->media_dev;
+        struct media_entity *entity;
+        struct media_entity *tuner = NULL, *decoder = NULL;
+        int i, ret;
+
+        if (!mdev)
+                return 0;
+
+        media_device_for_each_entity(entity, mdev) {
+                switch (entity->function) {
+                case MEDIA_ENT_F_TUNER:
+                        tuner = entity;
+                        break;
+                case MEDIA_ENT_F_ATV_DECODER:
+                        decoder = entity;
+                        break;
+                }
+        }
+
+        /* Analog setup, using tuner as a link */
+
+        /* Something bad happened! */
+        if (!decoder)
+                return -EINVAL;
+
+        if (tuner) {
+                ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
+                                            decoder, 0,
+                                            MEDIA_LNK_FL_ENABLED);
+                if (ret)
+                        return ret;
+        }
+        ret = media_create_pad_link(decoder, 1, &dev->vdev.entity, 0,
+                                    MEDIA_LNK_FL_ENABLED);
+        if (ret)
+                return ret;
+        ret = media_create_pad_link(decoder, 2, &dev->vbi_dev.entity, 0,
+                                    MEDIA_LNK_FL_ENABLED);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < AU0828_MAX_INPUT; i++) {
+                struct media_entity *ent = &dev->input_ent[i];
+
+                switch (AUVI_INPUT(i).type) {
+                case AU0828_VMUX_UNDEFINED:
+                        break;
+                case AU0828_VMUX_CABLE:
+                case AU0828_VMUX_TELEVISION:
+                case AU0828_VMUX_DVB:
+                        if (!tuner)
+                                break;
+
+                        ret = media_create_pad_link(ent, 0, tuner,
+                                                    TUNER_PAD_RF_INPUT,
+                                                    MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                        break;
+                case AU0828_VMUX_COMPOSITE:
+                case AU0828_VMUX_SVIDEO:
+                        /* FIXME: fix the decoder PAD */
+                        ret = media_create_pad_link(ent, 0, decoder, 0, 0);
+                        if (ret)
+                                return ret;
+                        break;
+                }
+        }
+#endif
+        return 0;
+}
+
+static void au0828_usb_v4l2_release(struct v4l2_device *v4l2_dev)
+{
+        struct au0828_dev *dev =
+                container_of(v4l2_dev, struct au0828_dev, v4l2_dev);
+
+        v4l2_ctrl_handler_free(&dev->v4l2_ctrl_hdl);
+        v4l2_device_unregister(&dev->v4l2_dev);
+        au0828_usb_v4l2_media_release(dev);
+        au0828_usb_release(dev);
+}
+
+int au0828_v4l2_device_register(struct usb_interface *interface,
+                                struct au0828_dev *dev)
+{
+        int retval;
+
+        if (AUVI_INPUT(0).type == AU0828_VMUX_UNDEFINED)
+                return 0;
+
+        /* Create the v4l2_device */
+#ifdef CONFIG_MEDIA_CONTROLLER
+        dev->v4l2_dev.mdev = dev->media_dev;
+#endif
+        retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
+        if (retval) {
+                pr_err("%s() v4l2_device_register failed\n",
+                       __func__);
+                mutex_unlock(&dev->lock);
+                kfree(dev);
+                return retval;
+        }
+
+        dev->v4l2_dev.release = au0828_usb_v4l2_release;
+
+        /* This control handler will inherit the controls from au8522 */
+        retval = v4l2_ctrl_handler_init(&dev->v4l2_ctrl_hdl, 4);
+        if (retval) {
+                pr_err("%s() v4l2_ctrl_handler_init failed\n",
+                       __func__);
+                mutex_unlock(&dev->lock);
+                kfree(dev);
+                return retval;
+        }
+        dev->v4l2_dev.ctrl_handler = &dev->v4l2_ctrl_hdl;
+
+        return 0;
+}
+
 static int au0828_enable_analog_tuner(struct au0828_dev *dev)
 {
 #ifdef CONFIG_MEDIA_CONTROLLER
@@ -949,13 +1085,23 @@ static struct vb2_ops au0828_video_qops = {
  * au0828_analog_unregister
  * unregister v4l2 devices
  */
-void au0828_analog_unregister(struct au0828_dev *dev)
+int au0828_analog_unregister(struct au0828_dev *dev)
 {
         dprintk(1, "au0828_analog_unregister called\n");
+
+        /* No analog TV */
+        if (AUVI_INPUT(0).type == AU0828_VMUX_UNDEFINED)
+                return 0;
+
         mutex_lock(&au0828_sysfs_lock);
         video_unregister_device(&dev->vdev);
         video_unregister_device(&dev->vbi_dev);
         mutex_unlock(&au0828_sysfs_lock);
+
+        v4l2_device_disconnect(&dev->v4l2_dev);
+        v4l2_device_put(&dev->v4l2_dev);
+
+        return 1;
 }
 
 /* This function ensures that video frames continue to be delivered even if
@@ -1312,7 +1458,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
                 [AU0828_VMUX_CABLE] = "Cable TV",
                 [AU0828_VMUX_TELEVISION] = "Television",
                 [AU0828_VMUX_DVB] = "DVB",
-                [AU0828_VMUX_DEBUG] = "tv debug"
         };
 
         dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
@@ -1804,7 +1949,6 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
                 [AU0828_VMUX_CABLE] = "Cable TV",
                 [AU0828_VMUX_TELEVISION] = "Television",
                 [AU0828_VMUX_DVB] = "DVB",
-                [AU0828_VMUX_DEBUG] = "tv debug"
         };
         int ret, i;
 
@@ -1840,11 +1984,9 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
                 case AU0828_VMUX_CABLE:
                 case AU0828_VMUX_TELEVISION:
                 case AU0828_VMUX_DVB:
+                default: /* Just to shut up a warning */
                         ent->function = MEDIA_ENT_F_CONN_RF;
                         break;
-                default: /* AU0828_VMUX_DEBUG */
-                        ent->function = MEDIA_ENT_F_CONN_TEST;
-                        break;
                 }
 
                 ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
@@ -1871,6 +2013,10 @@ int au0828_analog_register(struct au0828_dev *dev,
         dprintk(1, "au0828_analog_register called for intf#%d!\n",
                 interface->cur_altsetting->desc.bInterfaceNumber);
 
+        /* No analog TV */
+        if (AUVI_INPUT(0).type == AU0828_VMUX_UNDEFINED)
+                return 0;
+
         /* set au0828 usb interface0 to as5 */
         retval = usb_set_interface(dev->usbdev,
                         interface->cur_altsetting->desc.bInterfaceNumber, 5);
@@ -1976,6 +2122,14 @@ int au0828_analog_register(struct au0828_dev *dev,
                 ret = -ENODEV;
                 goto err_reg_vbi_dev;
         }
+        retval = au0828_create_media_graph(dev);
+        if (retval) {
+                pr_err("%s() au0282_dev_register failed to create graph\n",
+                        __func__);
+                ret = -ENODEV;
+                goto err_reg_vbi_dev;
+        }
+
 
         dprintk(1, "%s completed!\n", __func__);
 
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 8276072bc55a..23f869cf11da 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -76,7 +76,6 @@ enum au0828_itype {
         AU0828_VMUX_CABLE,
         AU0828_VMUX_TELEVISION,
         AU0828_VMUX_DVB,
-        AU0828_VMUX_DEBUG
 };
 
 struct au0828_input {
@@ -301,6 +300,7 @@ struct au0828_dev {
 /* au0828-core.c */
 extern u32 au0828_read(struct au0828_dev *dev, u16 reg);
 extern u32 au0828_write(struct au0828_dev *dev, u16 reg, u32 val);
+extern void au0828_usb_release(struct au0828_dev *dev);
 extern int au0828_debug;
 
 /* ----------------------------------------------------------- */
@@ -319,16 +319,29 @@ extern int au0828_i2c_unregister(struct au0828_dev *dev);
 
 /* ----------------------------------------------------------- */
 /* au0828-video.c */
-extern int au0828_analog_register(struct au0828_dev *dev,
-                           struct usb_interface *interface);
-extern void au0828_analog_unregister(struct au0828_dev *dev);
 extern int au0828_start_analog_streaming(struct vb2_queue *vq,
                                                 unsigned int count);
 extern void au0828_stop_vbi_streaming(struct vb2_queue *vq);
 #ifdef CONFIG_VIDEO_AU0828_V4L2
+extern int au0828_v4l2_device_register(struct usb_interface *interface,
+                                      struct au0828_dev *dev);
+
+extern int au0828_analog_register(struct au0828_dev *dev,
+                           struct usb_interface *interface);
+extern int au0828_analog_unregister(struct au0828_dev *dev);
+extern void au0828_usb_v4l2_media_release(struct au0828_dev *dev);
 extern void au0828_v4l2_suspend(struct au0828_dev *dev);
 extern void au0828_v4l2_resume(struct au0828_dev *dev);
 #else
+static inline int au0828_v4l2_device_register(struct usb_interface *interface,
+                                              struct au0828_dev *dev)
+{ return 0; };
+static inline int au0828_analog_register(struct au0828_dev *dev,
+                                     struct usb_interface *interface)
+{ return 0; };
+static inline int au0828_analog_unregister(struct au0828_dev *dev)
+{ return 0; };
+static inline void au0828_usb_v4l2_media_release(struct au0828_dev *dev) { };
 static inline void au0828_v4l2_suspend(struct au0828_dev *dev) { };
 static inline void au0828_v4l2_resume(struct au0828_dev *dev) { };
 #endif
diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
index 0bd969063392..d4bdba60b0f7 100644
--- a/drivers/media/usb/b2c2/flexcop-usb.c
+++ b/drivers/media/usb/b2c2/flexcop-usb.c
@@ -10,7 +10,7 @@
 /* Version information */
 #define DRIVER_VERSION "0.1"
 #define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV USB Driver"
-#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@posteo.de>"
 
 /* debug */
 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c
index 187012ce444b..0310fd6ed103 100644
--- a/drivers/media/usb/cpia2/cpia2_core.c
+++ b/drivers/media/usb/cpia2/cpia2_core.c
@@ -923,7 +923,7 @@ static int apply_vp_patch(struct camera_data *cam)
         /* ... followed by the data payload */
         for (i = 2; i < fw->size; i += 64) {
                 cmd.start = 0x0C; /* Data */
-                cmd.reg_count = min_t(int, 64, fw->size - i);
+                cmd.reg_count = min_t(uint, 64, fw->size - i);
                 memcpy(cmd.buffer.block_data, &fw->data[i], cmd.reg_count);
                 cpia2_send_command(cam, &cmd);
         }
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index 48643b94e694..c9320d6c6131 100644
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -1382,6 +1382,8 @@ static int cx231xx_bulk_copy(struct cx231xx *dev, struct urb *urb)
         buffer_size = urb->actual_length;
 
         buffer = kmalloc(buffer_size, GFP_ATOMIC);
+        if (!buffer)
+                return -ENOMEM;
 
         memcpy(buffer, dma_q->ps_head, 3);
         memcpy(buffer+3, p_buffer, buffer_size-3);
diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
index de4ae5eb4830..a6a9508418f8 100644
--- a/drivers/media/usb/cx231xx/cx231xx-audio.c
+++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
@@ -499,6 +499,11 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
         }
 
         dev->adev.users--;
+        if (substream->runtime->dma_area) {
+                dev_dbg(dev->dev, "freeing\n");
+                vfree(substream->runtime->dma_area);
+                substream->runtime->dma_area = NULL;
+        }
         mutex_unlock(&dev->lock);
 
         if (dev->adev.users == 0 && dev->adev.shutdown == 1) {
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 620b83d03f75..9e3a5d2038c2 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1212,70 +1212,15 @@ static int cx231xx_media_device_init(struct cx231xx *dev,
 #ifdef CONFIG_MEDIA_CONTROLLER
         struct media_device *mdev;
 
-        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        mdev = v4l2_mc_usb_media_device_init(udev, dev->board.name);
         if (!mdev)
                 return -ENOMEM;
 
-        mdev->dev = dev->dev;
-        strlcpy(mdev->model, dev->board.name, sizeof(mdev->model));
-        if (udev->serial)
-                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
-        strcpy(mdev->bus_info, udev->devpath);
-        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
-        mdev->driver_version = LINUX_VERSION_CODE;
-
-        media_device_init(mdev);
-
         dev->media_dev = mdev;
 #endif
         return 0;
 }
 
-static int cx231xx_create_media_graph(struct cx231xx *dev)
-{
-#ifdef CONFIG_MEDIA_CONTROLLER
-        struct media_device *mdev = dev->media_dev;
-        struct media_entity *entity;
-        struct media_entity *tuner = NULL, *decoder = NULL;
-        int ret;
-
-        if (!mdev)
-                return 0;
-
-        media_device_for_each_entity(entity, mdev) {
-                switch (entity->function) {
-                case MEDIA_ENT_F_TUNER:
-                        tuner = entity;
-                        break;
-                case MEDIA_ENT_F_ATV_DECODER:
-                        decoder = entity;
-                        break;
-                }
-        }
-
-        /* Analog setup, using tuner as a link */
-
-        if (!decoder)
-                return 0;
-
-        if (tuner) {
-                ret = media_create_pad_link(tuner, TUNER_PAD_IF_OUTPUT, decoder, 0,
-                                            MEDIA_LNK_FL_ENABLED);
-                if (ret < 0)
-                        return ret;
-        }
-        ret = media_create_pad_link(decoder, 1, &dev->vdev.entity, 0,
-                                    MEDIA_LNK_FL_ENABLED);
-        if (ret < 0)
-                return ret;
-        ret = media_create_pad_link(decoder, 2, &dev->vbi_dev.entity, 0,
-                                    MEDIA_LNK_FL_ENABLED);
-        if (ret < 0)
-                return ret;
-#endif
-        return 0;
-}
-
 /*
  * cx231xx_init_dev()
  * allocates and inits the device structs, registers i2c bus and v4l device
@@ -1739,15 +1684,14 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         /* load other modules required */
         request_modules(dev);
 
-        retval = cx231xx_create_media_graph(dev);
-        if (retval < 0)
-                goto done;
-
 #ifdef CONFIG_MEDIA_CONTROLLER
-        retval = media_device_register(dev->media_dev);
-#endif
+        /* Init entities at the Media Controller */
+        cx231xx_v4l2_create_entities(dev);
 
-done:
+        retval = v4l2_mc_create_media_graph(dev->media_dev);
+        if (!retval)
+                retval = media_device_register(dev->media_dev);
+#endif
         if (retval < 0)
                 cx231xx_release_resources(dev);
         return retval;
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index b8d5b2be9293..ab2fb9fa0cd1 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -25,6 +25,7 @@
 
 #include <media/v4l2-common.h>
 #include <media/videobuf-vmalloc.h>
+#include <media/tuner.h>
 
 #include "xc5000.h"
 #include "s5h1432.h"
@@ -551,7 +552,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
 
         /* register network adapter */
         dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
-        result = dvb_create_media_graph(&dvb->adapter, false);
+        result = dvb_create_media_graph(&dvb->adapter,
+                                        dev->tuner_type == TUNER_ABSENT);
         if (result < 0)
                 goto fail_create_graph;
 
@@ -801,6 +803,9 @@ static int dvb_init(struct cx231xx *dev)
                 /* attach tuner */
                 memset(&si2157_config, 0, sizeof(si2157_config));
                 si2157_config.fe = dev->dvb->frontend;
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+                si2157_config.mdev = dev->media_dev;
+#endif
                 si2157_config.if_port = 1;
                 si2157_config.inversion = true;
                 strlcpy(info.type, "si2157", I2C_NAME_SIZE);
@@ -857,6 +862,9 @@ static int dvb_init(struct cx231xx *dev)
                 /* attach tuner */
                 memset(&si2157_config, 0, sizeof(si2157_config));
                 si2157_config.fe = dev->dvb->frontend;
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+                si2157_config.mdev = dev->media_dev;
+#endif
                 si2157_config.if_port = 1;
                 si2157_config.inversion = true;
                 strlcpy(info.type, "si2157", I2C_NAME_SIZE);
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 9b88cd8127ac..6414188ffdfa 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1103,9 +1103,54 @@ static const char *iname[] = {
         [CX231XX_VMUX_TELEVISION] = "Television",
         [CX231XX_VMUX_CABLE]      = "Cable TV",
         [CX231XX_VMUX_DVB]        = "DVB",
-        [CX231XX_VMUX_DEBUG]      = "for debug only",
 };
 
+void cx231xx_v4l2_create_entities(struct cx231xx *dev)
+{
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        int ret, i;
+
+        /* Create entities for each input connector */
+        for (i = 0; i < MAX_CX231XX_INPUT; i++) {
+                struct media_entity *ent = &dev->input_ent[i];
+
+                if (!INPUT(i)->type)
+                        break;
+
+                ent->name = iname[INPUT(i)->type];
+                ent->flags = MEDIA_ENT_FL_CONNECTOR;
+                dev->input_pad[i].flags = MEDIA_PAD_FL_SOURCE;
+
+                switch (INPUT(i)->type) {
+                case CX231XX_VMUX_COMPOSITE1:
+                        ent->function = MEDIA_ENT_F_CONN_COMPOSITE;
+                        break;
+                case CX231XX_VMUX_SVIDEO:
+                        ent->function = MEDIA_ENT_F_CONN_SVIDEO;
+                        break;
+                case CX231XX_VMUX_TELEVISION:
+                case CX231XX_VMUX_CABLE:
+                case CX231XX_VMUX_DVB:
+                        /* The DVB core will handle it */
+                        if (dev->tuner_type == TUNER_ABSENT)
+                                continue;
+                        /* fall though */
+                default: /* just to shut up a gcc warning */
+                        ent->function = MEDIA_ENT_F_CONN_RF;
+                        break;
+                }
+
+                ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
+                if (ret < 0)
+                        pr_err("failed to initialize input pad[%d]!\n", i);
+
+                ret = media_device_register_entity(dev->media_dev, ent);
+                if (ret < 0)
+                        pr_err("failed to register input entity %d!\n", i);
+        }
+#endif
+}
+
 int cx231xx_enum_input(struct file *file, void *priv,
                              struct v4l2_input *i)
 {
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index ec6d3f5bc36d..69f6d20870f5 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -281,7 +281,6 @@ enum cx231xx_itype {
         CX231XX_VMUX_CABLE,
         CX231XX_RADIO,
         CX231XX_VMUX_DVB,
-        CX231XX_VMUX_DEBUG
 };
 
 enum cx231xx_v_input {
@@ -663,6 +662,8 @@ struct cx231xx {
 #if defined(CONFIG_MEDIA_CONTROLLER)
         struct media_device *media_dev;
         struct media_pad video_pad, vbi_pad;
+        struct media_entity input_ent[MAX_CX231XX_INPUT];
+        struct media_pad input_pad[MAX_CX231XX_INPUT];
 #endif
 
         unsigned char eedata[256];
@@ -943,6 +944,7 @@ int cx231xx_register_extension(struct cx231xx_ops *dev);
 void cx231xx_unregister_extension(struct cx231xx_ops *dev);
 void cx231xx_init_extension(struct cx231xx *dev);
 void cx231xx_close_extension(struct cx231xx *dev);
+void cx231xx_v4l2_create_entities(struct cx231xx *dev);
 int cx231xx_querycap(struct file *file, void *priv,
                            struct v4l2_capability *cap);
 int cx231xx_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t);
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 6e02a15d39ce..b3c09fe54d9b 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -684,7 +684,7 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
         if (ret < 0)
                 goto err;
 
-        if (tmp == 1 || tmp == 3) {
+        if (tmp == 1 || tmp == 3 || tmp == 5) {
                 /* configure gpioh1, reset & power slave demod */
                 ret = af9035_wr_reg_mask(d, 0x00d8b0, 0x01, 0x01);
                 if (ret < 0)
@@ -823,7 +823,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
         if (ret < 0)
                 goto err;
 
-        if (tmp == 1 || tmp == 3)
+        if (tmp == 1 || tmp == 3 || tmp == 5)
                 state->dual_mode = true;
 
         dev_dbg(&d->udev->dev, "%s: ts mode=%d dual mode=%d\n", __func__,
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
index 416a97f05ec8..df22001f9e41 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.h
+++ b/drivers/media/usb/dvb-usb-v2/af9035.h
@@ -112,9 +112,10 @@ static const u32 clock_lut_it9135[] = {
  * 0  TS
  * 1  DCA + PIP
  * 3  PIP
+ * 5  DCA + PIP
  * n  DCA
  *
- * Values 0 and 3 are seen to this day. 0 for single TS and 3 for dual TS.
+ * Values 0, 3 and 5 are seen to this day. 0 for single TS and 3/5 for dual TS.
  */
 
 #define EEPROM_BASE_AF9035        0x42fd
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index 023d91f7e654..35f27e2e4e28 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -1,7 +1,7 @@
 /*
  * DVB USB framework
  *
- * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@posteo.de>
  * Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
  *
  *    This program is free software; you can redistribute it and/or modify
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h b/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
index 45f07090d431..a1622bda2a5e 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
@@ -1,7 +1,7 @@
 /*
  * DVB USB framework
  *
- * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@posteo.de>
  * Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
  *
  *    This program is free software; you can redistribute it and/or modify
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index f0565bf3673e..4a8769781cea 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -1,7 +1,7 @@
 /*
  * DVB USB framework
  *
- * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@posteo.de>
  * Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
  */
 
 #include "dvb_usb_common.h"
+#include <media/v4l2-mc.h>
 
 static int dvb_usbv2_disable_rc_polling;
 module_param_named(disable_rc_polling, dvb_usbv2_disable_rc_polling, int, 0644);
@@ -407,20 +408,10 @@ static int dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap)
         struct dvb_usb_device *d = adap_to_d(adap);
         struct usb_device *udev = d->udev;
 
-        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        mdev = v4l2_mc_usb_media_device_init(udev, d->name);
         if (!mdev)
                 return -ENOMEM;
 
-        mdev->dev = &udev->dev;
-        strlcpy(mdev->model, d->name, sizeof(mdev->model));
-        if (udev->serial)
-                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
-        strcpy(mdev->bus_info, udev->devpath);
-        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
-        mdev->driver_version = LINUX_VERSION_CODE;
-
-        media_device_init(mdev);
-
         dvb_register_media_controller(&adap->dvb_adap, mdev);
 
         dev_info(&d->udev->dev, "media controller created\n");
@@ -1129,7 +1120,7 @@ int dvb_usbv2_reset_resume(struct usb_interface *intf)
 EXPORT_SYMBOL(dvb_usbv2_reset_resume);
 
 MODULE_VERSION("2.0");
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("DVB USB common");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
index 22bdce15ecf3..5bafeb6486be 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
@@ -1,7 +1,7 @@
 /*
  * DVB USB framework
  *
- * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@posteo.de>
  * Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
  *
  *    This program is free software; you can redistribute it and/or modify
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index 1dd962535f97..02dbc6c45423 100644
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -847,10 +847,17 @@ static const struct usb_device_id dvbsky_id_table[] = {
                 USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI,
                 &dvbsky_t680c_props, "TechnoTrend TT-connect CT2-4650 CI",
                 RC_MAP_TT_1500) },
+        { DVB_USB_DEVICE(USB_VID_TECHNOTREND,
+                USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI_2,
+                &dvbsky_t680c_props, "TechnoTrend TT-connect CT2-4650 CI v1.1",
+                RC_MAP_TT_1500) },
         { DVB_USB_DEVICE(USB_VID_TERRATEC,
                 USB_PID_TERRATEC_H7_3,
                 &dvbsky_t680c_props, "Terratec H7 Rev.4",
                 RC_MAP_TT_1500) },
+        { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R4,
+                &dvbsky_s960_props, "Terratec Cinergy S2 Rev.4",
+                RC_MAP_DVBSKY) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, dvbsky_id_table);
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
index 84f6de6fa07d..047a32fe43ea 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
@@ -507,9 +507,9 @@ static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,
         return 0;
 }
 
-static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe)
+static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,
+                                       struct dtv_frontend_properties *p)
 {
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct mxl111sf_demod_state *state = fe->demodulator_priv;
 
         mxl_dbg("()");
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
index 444579be0b77..7d16252dbb71 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
@@ -36,7 +36,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");
 struct mxl111sf_tuner_state {
         struct mxl111sf_state *mxl_state;
 
-        struct mxl111sf_tuner_config *cfg;
+        const struct mxl111sf_tuner_config *cfg;
 
         enum mxl_if_freq if_freq;
 
@@ -489,8 +489,8 @@ static struct dvb_tuner_ops mxl111sf_tuner_tuner_ops = {
 };
 
 struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
-                                           struct mxl111sf_state *mxl_state,
-                                           struct mxl111sf_tuner_config *cfg)
+                                struct mxl111sf_state *mxl_state,
+                                const struct mxl111sf_tuner_config *cfg)
 {
         struct mxl111sf_tuner_state *state = NULL;
 
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
index e6caab21a197..509b55071218 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
@@ -63,13 +63,13 @@ struct mxl111sf_tuner_config {
 #if IS_ENABLED(CONFIG_DVB_USB_MXL111SF)
 extern
 struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
-                                           struct mxl111sf_state *mxl_state,
-                                           struct mxl111sf_tuner_config *cfg);
+                                struct mxl111sf_state *mxl_state,
+                                const struct mxl111sf_tuner_config *cfg);
 #else
 static inline
 struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
-                                           struct mxl111sf_state *mxl_state,
-                                           struct mxl111sf_tuner_config *cfg)
+                                struct mxl111sf_state *mxl_state,
+                                const struct mxl111sf_tuner_config *cfg)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
index b669deccc34c..5d676b533a3a 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
@@ -856,7 +856,7 @@ static int mxl111sf_ant_hunt(struct dvb_frontend *fe)
         return 0;
 }
 
-static struct mxl111sf_tuner_config mxl_tuner_config = {
+static const struct mxl111sf_tuner_config mxl_tuner_config = {
         .if_freq         = MXL_IF_6_0, /* applies to external IF output, only */
         .invert_spectrum = 0,
         .read_reg        = mxl111sf_read_reg,
@@ -888,7 +888,7 @@ static int mxl111sf_attach_tuner(struct dvb_usb_adapter *adap)
         state->tuner.function = MEDIA_ENT_F_TUNER;
         state->tuner.name = "mxl111sf tuner";
         state->tuner_pads[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
-        state->tuner_pads[TUNER_PAD_IF_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
+        state->tuner_pads[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
 
         ret = media_entity_pads_init(&state->tuner,
                                      TUNER_NUM_PADS, state->tuner_pads);
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index eb5787a3191e..c4c6e92e8643 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -259,6 +259,10 @@ static int rtl28xxu_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 ret = -EOPNOTSUPP;
         }
 
+        /* Retry failed I2C messages */
+        if (ret == -EPIPE)
+                ret = -EAGAIN;
+
 err_mutex_unlock:
         mutex_unlock(&d->i2c_mutex);
 
@@ -619,6 +623,10 @@ static int rtl28xxu_identify_state(struct dvb_usb_device *d, const char **name)
         }
         dev_dbg(&d->intf->dev, "chip_id=%u\n", dev->chip_id);
 
+        /* Retry failed I2C messages */
+        d->i2c_adap.retries = 1;
+        d->i2c_adap.timeout = msecs_to_jiffies(10);
+
         return WARM;
 err:
         dev_dbg(&d->intf->dev, "failed=%d\n", ret);
diff --git a/drivers/media/usb/dvb-usb-v2/usb_urb.c b/drivers/media/usb/dvb-usb-v2/usb_urb.c
index ca8f3c2b1082..55136cde38f5 100644
--- a/drivers/media/usb/dvb-usb-v2/usb_urb.c
+++ b/drivers/media/usb/dvb-usb-v2/usb_urb.c
@@ -1,6 +1,6 @@
 /* usb-urb.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file keeps functions for initializing and handling the
diff --git a/drivers/media/usb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c
index 83684ed023cd..7ba975bea96a 100644
--- a/drivers/media/usb/dvb-usb/a800.c
+++ b/drivers/media/usb/dvb-usb/a800.c
@@ -1,7 +1,7 @@
 /* DVB USB framework compliant Linux driver for the AVerMedia AverTV DVB-T
  * USB2.0 (A800) DVB-T receiver.
  *
- * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * Thanks to
  *   - AVerMedia who kindly provided information and
@@ -185,7 +185,7 @@ static struct usb_driver a800_driver = {
 
 module_usb_driver(a800_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("AVerMedia AverTV DVB-T USB 2.0 (A800)");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c
index ac97075d75f7..09db3d02bd82 100644
--- a/drivers/media/usb/dvb-usb/af9005-fe.c
+++ b/drivers/media/usb/dvb-usb/af9005-fe.c
@@ -1227,9 +1227,9 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int af9005_fe_get_frontend(struct dvb_frontend *fe)
+static int af9005_fe_get_frontend(struct dvb_frontend *fe,
+                                  struct dtv_frontend_properties *fep)
 {
-        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct af9005_fe_state *state = fe->demodulator_priv;
         int ret;
         u8 temp;
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index ab7151181728..907ac01ae297 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -13,7 +13,7 @@
  *
  * TODO: Use the cx25840-driver for the analogue part
  *
- * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@posteo.de)
  * Copyright (C) 2006 Michael Krufky (mkrufky@linuxtv.org)
  * Copyright (C) 2006, 2007 Chris Pascoe (c.pascoe@itee.uq.edu.au)
  *
@@ -2314,7 +2314,7 @@ static struct usb_driver cxusb_driver = {
 
 module_usb_driver(cxusb_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
 MODULE_DESCRIPTION("Driver for Conexant USB2.0 hybrid reference design");
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index 0d248ce02a9b..c16f999b9d7c 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -881,7 +881,7 @@ static struct usb_driver dib0700_driver = {
 module_usb_driver(dib0700_driver);
 
 MODULE_FIRMWARE("dvb-usb-dib0700-1.20.fw");
-MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for devices based on DiBcom DiB0700 - USB bridge");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 7ed49646a699..ea0391e32d23 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -1736,8 +1736,13 @@ static int dib809x_tuner_attach(struct dvb_usb_adapter *adap)
         struct dib0700_adapter_state *st = adap->priv;
         struct i2c_adapter *tun_i2c = st->dib8000_ops.get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_TUNER, 1);
 
-        if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
-                return -ENODEV;
+        if (adap->id == 0) {
+                if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
+                        return -ENODEV;
+        } else {
+                if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
+                        return -ENODEV;
+        }
 
         st->set_param_save = adap->fe_adap[0].fe->ops.tuner_ops.set_params;
         adap->fe_adap[0].fe->ops.tuner_ops.set_params = dib8096_set_param_override;
@@ -1773,6 +1778,20 @@ static int stk809x_frontend_attach(struct dvb_usb_adapter *adap)
         return adap->fe_adap[0].fe == NULL ?  -ENODEV : 0;
 }
 
+static int stk809x_frontend1_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_adapter_state *state = adap->priv;
+
+        if (!dvb_attach(dib8000_attach, &state->dib8000_ops))
+                return -ENODEV;
+
+        state->dib8000_ops.i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x82, 0);
+
+        adap->fe_adap[0].fe = state->dib8000_ops.init(&adap->dev->i2c_adap, 0x82, &dib809x_dib8000_config[1]);
+
+        return adap->fe_adap[0].fe == NULL ?  -ENODEV : 0;
+}
+
 static int nim8096md_tuner_attach(struct dvb_usb_adapter *adap)
 {
         struct dib0700_adapter_state *st = adap->priv;
@@ -3794,6 +3813,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
 /* 80 */{ USB_DEVICE(USB_VID_ELGATO,    USB_PID_ELGATO_EYETV_DTT_2) },
         { USB_DEVICE(USB_VID_PCTV,      USB_PID_PCTV_2002E) },
         { USB_DEVICE(USB_VID_PCTV,      USB_PID_PCTV_2002E_SE) },
+        { USB_DEVICE(USB_VID_PCTV,      USB_PID_DIBCOM_STK8096PVR) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -4959,6 +4979,59 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                             RC_BIT_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
+        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+                .num_adapters = 2,
+                .adapter = {
+                        {
+                                .num_frontends = 1,
+                                .fe = {{
+                                        .caps  = DVB_USB_ADAP_HAS_PID_FILTER |
+                                                DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                                        .pid_filter_count = 32,
+                                        .pid_filter = stk80xx_pid_filter,
+                                        .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
+                                        .frontend_attach  = stk809x_frontend_attach,
+                                        .tuner_attach     = dib809x_tuner_attach,
+
+                                        DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+                                } },
+                                .size_of_priv =
+                                        sizeof(struct dib0700_adapter_state),
+                        }, {
+                                .num_frontends = 1,
+                                .fe = { {
+                                        .caps  = DVB_USB_ADAP_HAS_PID_FILTER |
+                                                DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                                        .pid_filter_count = 32,
+                                        .pid_filter = stk80xx_pid_filter,
+                                        .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
+                                        .frontend_attach  = stk809x_frontend1_attach,
+                                        .tuner_attach     = dib809x_tuner_attach,
+
+                                        DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+                                } },
+                                .size_of_priv =
+                                        sizeof(struct dib0700_adapter_state),
+                        },
+                },
+                .num_device_descs = 1,
+                .devices = {
+                        {   "DiBcom STK8096-PVR reference design",
+                                { &dib0700_usb_id_table[83], NULL },
+                                { NULL },
+                        },
+                },
+
+                .rc.core = {
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name  = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .allowed_protos   = RC_BIT_RC5 |
+                                RC_BIT_RC6_MCE |
+                                RC_BIT_NEC,
+                        .change_protocol  = dib0700_change_protocol,
+                },
         },
 };
 
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
index ef3a8f75f82e..35de6095926d 100644
--- a/drivers/media/usb/dvb-usb/dibusb-common.c
+++ b/drivers/media/usb/dvb-usb/dibusb-common.c
@@ -1,6 +1,6 @@
 /* Common methods for dibusb-based-receivers.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
index a4ac37e0e98b..a0057641cc86 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -1,10 +1,10 @@
 /* DVB USB compliant linux driver for mobile DVB-T USB devices based on
  * reference designs made by DiBcom (http://www.dibcom.fr/) (DiB3000M-B)
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * based on GPL code from DiBcom, which has
- * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ * Copyright (C) 2004 Amaury Demol for DiBcom
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -465,7 +465,7 @@ static struct usb_driver dibusb_driver = {
 
 module_usb_driver(dibusb_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for DiBcom USB DVB-T devices (DiB3000M-B based)");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
index 9d1a59d09c52..08fb8a3f6e0c 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -1,10 +1,10 @@
 /* DVB USB compliant linux driver for mobile DVB-T USB devices based on
  * reference designs made by DiBcom (http://www.dibcom.fr/) (DiB3000M-C/P)
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * based on GPL code from DiBcom, which has
- * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ * Copyright (C) 2004 Amaury Demol for DiBcom
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -143,7 +143,7 @@ static struct usb_driver dibusb_mc_driver = {
 
 module_usb_driver(dibusb_mc_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for DiBcom USB2.0 DVB-T (DiB3000M-C/P based) devices");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dibusb.h b/drivers/media/usb/dvb-usb/dibusb.h
index 32ab1392313f..3f82163d8ab8 100644
--- a/drivers/media/usb/dvb-usb/dibusb.h
+++ b/drivers/media/usb/dvb-usb/dibusb.h
@@ -1,6 +1,6 @@
 /* Header file for all dibusb-based-receivers.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c
index 772bde3c5020..63134335c994 100644
--- a/drivers/media/usb/dvb-usb/digitv.c
+++ b/drivers/media/usb/dvb-usb/digitv.c
@@ -1,7 +1,7 @@
 /* DVB USB compliant linux driver for Nebula Electronics uDigiTV DVB-T USB2.0
  * receiver
  *
- * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * partly based on the SDK published by Nebula Electronics
  *
@@ -348,7 +348,7 @@ static struct usb_driver digitv_driver = {
 
 module_usb_driver(digitv_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for Nebula Electronics uDigiTV DVB-T USB2.0");
 MODULE_VERSION("1.0-alpha");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c
index 8637ad1be6be..c09332bd99cb 100644
--- a/drivers/media/usb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/usb/dvb-usb/dtt200u-fe.c
@@ -1,7 +1,7 @@
 /* Frontend part of the Linux driver for the WideView/ Yakumo/ Hama/
  * Typhoon/ Yuan DVB-T USB2.0 receiver.
  *
- * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -140,10 +140,11 @@ static int dtt200u_fe_set_frontend(struct dvb_frontend *fe)
         return 0;
 }
 
-static int dtt200u_fe_get_frontend(struct dvb_frontend* fe)
+static int dtt200u_fe_get_frontend(struct dvb_frontend* fe,
+                                   struct dtv_frontend_properties *fep)
 {
-        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct dtt200u_fe_state *state = fe->demodulator_priv;
+
         memcpy(fep, &state->fep, sizeof(struct dtv_frontend_properties));
         return 0;
 }
diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
index c357fb3b0a88..ca3b69aa9688 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.c
+++ b/drivers/media/usb/dvb-usb/dtt200u.c
@@ -1,7 +1,7 @@
 /* DVB USB library compliant Linux driver for the WideView/ Yakumo/ Hama/
  * Typhoon/ Yuan/ Miglia DVB-T USB2.0 receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * Thanks to Steve Chang from WideView for providing support for the WT-220U.
  *
@@ -362,7 +362,7 @@ static struct usb_driver dtt200u_usb_driver = {
 
 module_usb_driver(dtt200u_usb_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon/Club3D/Miglia DVB-T USB2.0 devices");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dtt200u.h b/drivers/media/usb/dvb-usb/dtt200u.h
index 005b0a7df358..efccc399b1cb 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.h
+++ b/drivers/media/usb/dvb-usb/dtt200u.h
@@ -1,7 +1,7 @@
 /* Common header file of Linux driver for the WideView/ Yakumo/ Hama/
  * Typhoon/ Yuan DVB-T USB2.0 receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h
index 6b7b2a89242e..7e619d638809 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-common.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb-common.h
@@ -1,6 +1,6 @@
 /* dvb-usb-common.h is part of the DVB USB library.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * a header file containing prototypes and types for internal use of the dvb-usb-lib
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index 9ddfcab268be..513b0c14e4f0 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -1,12 +1,13 @@
 /* dvb-usb-dvb.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for initializing and handling the
  * linux-dvb API.
  */
 #include "dvb-usb-common.h"
+#include <media/v4l2-mc.h>
 
 /* does the complete input transfer handling */
 static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
@@ -102,19 +103,7 @@ static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap)
         struct dvb_usb_device *d = adap->dev;
         struct usb_device *udev = d->udev;
 
-        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
-        if (!mdev)
-                return -ENOMEM;
-
-        mdev->dev = &udev->dev;
-        strlcpy(mdev->model, d->desc->name, sizeof(mdev->model));
-        if (udev->serial)
-                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
-        strcpy(mdev->bus_info, udev->devpath);
-        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
-        mdev->driver_version = LINUX_VERSION_CODE;
-
-        media_device_init(mdev);
+        mdev = v4l2_mc_usb_media_device_init(udev, d->desc->name);
 
         dvb_register_media_controller(&adap->dvb_adap, mdev);
 
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
index 733a7ff7b207..dd048a7c461c 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
@@ -1,6 +1,6 @@
 /* dvb-usb-firmware.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for downloading the firmware to Cypress FX 1 and 2 based devices.
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
index 88e4a62abc44..4f0b0adce7f5 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
@@ -1,6 +1,6 @@
 /* dvb-usb-i2c.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for (de-)initializing an I2C adapter.
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 1adf325012f7..3896ba9a4179 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -3,7 +3,7 @@
  *
  * dvb-usb-init.c
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -299,6 +299,6 @@ void dvb_usb_device_exit(struct usb_interface *intf)
 EXPORT_SYMBOL(dvb_usb_device_exit);
 
 MODULE_VERSION("1.0");
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("A library module containing commonly used USB and DVB function USB DVB devices");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
index 7b5dae3077f6..c259f9e43542 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
@@ -1,6 +1,6 @@
 /* dvb-usb-remote.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file contains functions for initializing the input-device and for handling remote-control-queries.
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c
index 5c8f651344fc..95f9097498cb 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-urb.c
@@ -1,6 +1,6 @@
 /* dvb-usb-urb.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file keeps functions for initializing and handling the
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
index ce4c4e3b58bb..639c4678c65b 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -1,6 +1,6 @@
 /* dvb-usb.h is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * the headerfile, all dvb-usb-drivers have to include.
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 14ef25dc6cd3..dd46d6c78c4e 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1688,6 +1688,7 @@ enum dw2102_table_entry {
         TECHNOTREND_S2_4600,
         TEVII_S482_1,
         TEVII_S482_2,
+        TERRATEC_CINERGY_S2_BOX,
 };
 
 static struct usb_device_id dw2102_table[] = {
@@ -1702,19 +1703,20 @@ static struct usb_device_id dw2102_table[] = {
         [TEVII_S660] = {USB_DEVICE(0x9022, USB_PID_TEVII_S660)},
         [PROF_7500] = {USB_DEVICE(0x3034, 0x7500)},
         [GENIATECH_SU3000] = {USB_DEVICE(0x1f4d, 0x3000)},
-        [TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},
+        [TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},
         [TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
         [TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
         [X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
         [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
         [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
-        [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)},
+        [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
         [GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
         [GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
         [TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,
                 USB_PID_TECHNOTREND_CONNECT_S2_4600)},
         [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)},
         [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)},
+        [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)},
         { }
 };
 
@@ -2232,7 +2234,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
                 } },
                 }
         },
-        .num_device_descs = 3,
+        .num_device_descs = 4,
         .devices = {
                 { "TechnoTrend TT-connect S2-4600",
                         { &dw2102_table[TECHNOTREND_S2_4600], NULL },
@@ -2246,6 +2248,10 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
                         { &dw2102_table[TEVII_S482_2], NULL },
                         { NULL },
                 },
+                { "Terratec Cinergy S2 USB BOX",
+                        { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL },
+                        { NULL },
+                },
         }
 };
 
diff --git a/drivers/media/usb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
index 8ec92fbeabad..979f05b4b87c 100644
--- a/drivers/media/usb/dvb-usb/friio-fe.c
+++ b/drivers/media/usb/dvb-usb/friio-fe.c
@@ -283,20 +283,6 @@ static int jdvbt90502_set_property(struct dvb_frontend *fe,
         return r;
 }
 
-static int jdvbt90502_get_frontend(struct dvb_frontend *fe)
-{
-        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
-        p->inversion = INVERSION_AUTO;
-        p->bandwidth_hz = 6000000;
-        p->code_rate_HP = FEC_AUTO;
-        p->code_rate_LP = FEC_AUTO;
-        p->modulation = QAM_64;
-        p->transmission_mode = TRANSMISSION_MODE_AUTO;
-        p->guard_interval = GUARD_INTERVAL_AUTO;
-        p->hierarchy = HIERARCHY_AUTO;
-        return 0;
-}
-
 static int jdvbt90502_set_frontend(struct dvb_frontend *fe)
 {
         struct dtv_frontend_properties *p = &fe->dtv_property_cache;
@@ -312,8 +298,16 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe)
 
         deb_fe("%s: Freq:%d\n", __func__, p->frequency);
 
-        /* for recovery from DTV_CLEAN */
-        fe->dtv_property_cache.delivery_system = SYS_ISDBT;
+        /* This driver only works on auto mode */
+        p->inversion = INVERSION_AUTO;
+        p->bandwidth_hz = 6000000;
+        p->code_rate_HP = FEC_AUTO;
+        p->code_rate_LP = FEC_AUTO;
+        p->modulation = QAM_64;
+        p->transmission_mode = TRANSMISSION_MODE_AUTO;
+        p->guard_interval = GUARD_INTERVAL_AUTO;
+        p->hierarchy = HIERARCHY_AUTO;
+        p->delivery_system = SYS_ISDBT;
 
         ret = jdvbt90502_pll_set_freq(state, p->frequency);
         if (ret) {
@@ -466,7 +460,6 @@ static struct dvb_frontend_ops jdvbt90502_ops = {
         .set_property = jdvbt90502_set_property,
 
         .set_frontend = jdvbt90502_set_frontend,
-        .get_frontend = jdvbt90502_get_frontend,
 
         .read_status = jdvbt90502_read_status,
         .read_signal_strength = jdvbt90502_read_signal_strength,
diff --git a/drivers/media/usb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c
index 6c55384e2fca..fc7569e2728d 100644
--- a/drivers/media/usb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/usb/dvb-usb/nova-t-usb2.c
@@ -1,7 +1,7 @@
 /* DVB USB framework compliant Linux driver for the Hauppauge WinTV-NOVA-T usb2
  * DVB-T receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -227,7 +227,7 @@ static struct usb_driver nova_t_driver = {
 
 module_usb_driver(nova_t_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Hauppauge WinTV-NOVA-T usb2");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
index 6c3c47722955..51487d2f7764 100644
--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
@@ -512,7 +512,7 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
                         &a->dev->i2c_adap, STV090x_DEMODULATOR_0);
 
         if (a->fe_adap[0].fe) {
-                struct stv6110x_devctl *ctl;
+                const struct stv6110x_devctl *ctl;
 
                 ctl = dvb_attach(stv6110x_attach,
                                 a->fe_adap[0].fe,
diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
index f10717311e05..ecc207fbaf3c 100644
--- a/drivers/media/usb/dvb-usb/ttusb2.c
+++ b/drivers/media/usb/dvb-usb/ttusb2.c
@@ -820,7 +820,7 @@ static struct usb_driver ttusb2_driver = {
 
 module_usb_driver(ttusb2_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for Pinnacle PCTV 400e DVB-S USB2.0");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/umt-010.c b/drivers/media/usb/dvb-usb/umt-010.c
index 9b042292e788..58ad5b4f856c 100644
--- a/drivers/media/usb/dvb-usb/umt-010.c
+++ b/drivers/media/usb/dvb-usb/umt-010.c
@@ -1,7 +1,7 @@
 /* DVB USB framework compliant Linux driver for the HanfTek UMT-010 USB2.0
  * DVB-T receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the Free
@@ -145,7 +145,7 @@ static struct usb_driver umt_driver = {
 
 module_usb_driver(umt_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for HanfTek UMT 010 USB2.0 DVB-T device");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c
index d62ee0f5a165..89173603be67 100644
--- a/drivers/media/usb/dvb-usb/usb-urb.c
+++ b/drivers/media/usb/dvb-usb/usb-urb.c
@@ -1,6 +1,6 @@
 /* usb-urb.c is part of the DVB USB library.
  *
- * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
  *
  * This file keeps functions for initializing and handling the
diff --git a/drivers/media/usb/dvb-usb/vp702x-fe.c b/drivers/media/usb/dvb-usb/vp702x-fe.c
index d361a72ca0fa..27398c08c69d 100644
--- a/drivers/media/usb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/usb/dvb-usb/vp702x-fe.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 Ralph Metzler <rjkm@metzlerbros.de>
  *                    Metzler Brothers Systementwicklung GbR
  *
- * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  * Thanks to Twinhan who kindly provided hardware and information.
  *
diff --git a/drivers/media/usb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c
index ee1e19e36445..40de33de90a7 100644
--- a/drivers/media/usb/dvb-usb/vp702x.c
+++ b/drivers/media/usb/dvb-usb/vp702x.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 Ralph Metzler <rjkm@metzlerbros.de>
  *                    Metzler Brothers Systementwicklung GbR
  *
- * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@posteo.de>
  *
  * Thanks to Twinhan who kindly provided hardware and information.
  *
@@ -439,7 +439,7 @@ static struct usb_driver vp702x_usb_driver = {
 
 module_usb_driver(vp702x_usb_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for Twinhan StarBox DVB-S USB2.0 and clones");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/vp7045-fe.c b/drivers/media/usb/dvb-usb/vp7045-fe.c
index e708afc6a57f..7765602ea658 100644
--- a/drivers/media/usb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/usb/dvb-usb/vp7045-fe.c
@@ -1,7 +1,7 @@
 /* DVB frontend part of the Linux driver for TwinhanDTV Alpha/MagicBoxII USB2.0
  * DVB-T receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * Thanks to Twinhan who kindly provided hardware and information.
  *
diff --git a/drivers/media/usb/dvb-usb/vp7045.c b/drivers/media/usb/dvb-usb/vp7045.c
index d750724132ee..13340af0d39c 100644
--- a/drivers/media/usb/dvb-usb/vp7045.c
+++ b/drivers/media/usb/dvb-usb/vp7045.c
@@ -2,7 +2,7 @@
  *  - TwinhanDTV Alpha/MagicBoxII USB2.0 DVB-T receiver
  *  - DigitalNow TinyUSB2 DVB-t receiver
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * Thanks to Twinhan who kindly provided hardware and information.
  *
@@ -296,7 +296,7 @@ static struct usb_driver vp7045_usb_driver = {
 
 module_usb_driver(vp7045_usb_driver);
 
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@posteo.de>");
 MODULE_DESCRIPTION("Driver for Twinhan MagicBox/Alpha and DNTV tinyUSB2 DVB-T USB2.0");
 MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/usb/dvb-usb/vp7045.h b/drivers/media/usb/dvb-usb/vp7045.h
index cf5ec46f8bb1..66499932ca76 100644
--- a/drivers/media/usb/dvb-usb/vp7045.h
+++ b/drivers/media/usb/dvb-usb/vp7045.h
@@ -1,7 +1,7 @@
 /* Common header-file of the Linux driver for the TwinhanDTV Alpha/MagicBoxII
  * USB2.0 DVB-T receiver.
  *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
  *
  * Thanks to Twinhan who kindly provided hardware and information.
  *
diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c
index b58acd3fcd99..72f3f4d50253 100644
--- a/drivers/media/usb/em28xx/em28xx-camera.c
+++ b/drivers/media/usb/em28xx/em28xx-camera.c
@@ -64,6 +64,8 @@ static int em28xx_initialize_mt9m111(struct em28xx *dev)
                 i2c_master_send(&dev->i2c_client[dev->def_i2c_bus],
                                 &regs[i][0], 3);
 
+        /* FIXME: This won't be creating a sensor at the media graph */
+
         return 0;
 }
 
@@ -91,6 +93,8 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev)
                 i2c_master_send(&dev->i2c_client[dev->def_i2c_bus],
                                 &regs[i][0], 3);
 
+        /* FIXME: This won't be creating a sensor at the media graph */
+
         return 0;
 }
 
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a1b6ef5894a6..389e95fb0211 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -32,7 +32,7 @@
 #include <media/tuner.h>
 #include <media/drv-intf/msp3400.h>
 #include <media/i2c/saa7115.h>
-#include <media/i2c/tvp5150.h>
+#include <dt-bindings/media/tvp5150.h>
 #include <media/i2c/tvaudio.h>
 #include <media/i2c-addr.h>
 #include <media/tveeprom.h>
@@ -570,7 +570,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type    = TUNER_ABSENT,
                 .is_webcam     = 1,
                 .input         = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = 0,
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = silvercrest_reg_seq,
@@ -583,7 +583,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA711X,
                 .tuner_type   = TUNER_ABSENT,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -605,7 +605,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type    = TUNER_ABSENT,
                 .is_webcam     = 1,
                 .input         = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = 0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 } },
@@ -616,7 +616,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tda9887_conf = TDA9887_PRESENT,
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -635,7 +635,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -655,7 +655,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -675,7 +675,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -715,7 +715,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -735,7 +735,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -755,7 +755,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -775,7 +775,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -800,7 +800,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE4,
                         .amux     = EM28XX_AMUX_AUX,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE5,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -819,7 +819,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,
                 .is_webcam    = 1,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = 0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 } },
@@ -829,7 +829,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,
                 .is_webcam    = 1,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = 0,
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = silvercrest_reg_seq,
@@ -848,7 +848,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
@@ -863,7 +863,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,   /* Capture only device */
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
-                        .type  = EM28XX_VMUX_COMPOSITE1,
+                        .type  = EM28XX_VMUX_COMPOSITE,
                         .vmux  = SAA7115_COMPOSITE0,
                         .amux  = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -879,7 +879,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,
                 .is_webcam    = 1,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = 0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 } },
@@ -889,7 +889,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA711X,
                 .tuner_type   = TUNER_ABSENT,   /* Capture only device */
                 .input        = { {
-                        .type  = EM28XX_VMUX_COMPOSITE1,
+                        .type  = EM28XX_VMUX_COMPOSITE,
                         .vmux  = SAA7115_COMPOSITE0,
                         .amux  = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -909,7 +909,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -930,7 +930,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -952,7 +952,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -974,7 +974,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -992,7 +992,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1006,7 +1006,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type    = TUNER_ABSENT,  /* Capture only device */
                 .decoder       = EM28XX_TVP5150,
                 .input         = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1029,7 +1029,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = pinnacle_hybrid_pro_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = pinnacle_hybrid_pro_analog,
@@ -1100,7 +1100,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = terratec_cinergy_USB_XS_FR_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = terratec_cinergy_USB_XS_FR_analog,
@@ -1186,7 +1186,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1213,7 +1213,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1239,7 +1239,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1265,7 +1265,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1291,7 +1291,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1317,7 +1317,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1343,7 +1343,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = default_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = default_analog,
@@ -1368,7 +1368,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1392,7 +1392,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux      = SAA7115_COMPOSITE4,
                         .amux      = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type      = EM28XX_VMUX_COMPOSITE1,
+                        .type      = EM28XX_VMUX_COMPOSITE,
                         .vmux      = SAA7115_COMPOSITE0,
                         .amux      = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1413,7 +1413,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1428,7 +1428,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder    = EM28XX_SAA711X,
                 .tuner_type = TUNER_ABSENT, /* capture only board */
                 .input      = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1443,7 +1443,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,   /* Capture-only board */
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = vc211a_enable,
@@ -1465,7 +1465,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1485,7 +1485,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1500,7 +1500,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT, /* capture only board */
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1520,7 +1520,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1541,7 +1541,7 @@ struct em28xx_board em28xx_boards[] = {
                         .aout     = EM28XX_AOUT_MONO |  /* I2S */
                                     EM28XX_AOUT_MASTER, /* Line out pin */
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1555,6 +1555,7 @@ struct em28xx_board em28xx_boards[] = {
                 .buttons = std_snapshot_button,
                 .tda9887_conf = TDA9887_PRESENT,
                 .tuner_type   = TUNER_YMEC_TVF_5533MF,
+                .tuner_addr   = 0x60,
                 .decoder      = EM28XX_SAA711X,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1563,7 +1564,7 @@ struct em28xx_board em28xx_boards[] = {
                         .aout     = EM28XX_AOUT_MONO |  /* I2S */
                                     EM28XX_AOUT_MASTER, /* Line out pin */
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1581,7 +1582,7 @@ struct em28xx_board em28xx_boards[] = {
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = SAA7115_SVIDEO3,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                 } },
         },
@@ -1610,7 +1611,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = em2880_msi_digivox_ad_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = em2880_msi_digivox_ad_analog,
@@ -1633,7 +1634,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = em2880_msi_digivox_ad_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = em2880_msi_digivox_ad_analog,
@@ -1654,7 +1655,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1677,7 +1678,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = default_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = default_analog,
@@ -1708,7 +1709,7 @@ struct em28xx_board em28xx_boards[] = {
                         .gpio = em2882_kworld_315u_analog,
                         .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
                 }, {
-                        .type = EM28XX_VMUX_COMPOSITE1,
+                        .type = EM28XX_VMUX_COMPOSITE,
                         .vmux = SAA7115_COMPOSITE0,
                         .amux = EM28XX_AMUX_LINE_IN,
                         .gpio = em2882_kworld_315u_analog1,
@@ -1735,7 +1736,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux = EM28XX_AMUX_VIDEO,
                         .gpio = default_analog,
                 }, {
-                        .type = EM28XX_VMUX_COMPOSITE1,
+                        .type = EM28XX_VMUX_COMPOSITE,
                         .vmux = TVP5150_COMPOSITE1,
                         .amux = EM28XX_AMUX_LINE_IN,
                         .gpio = default_analog,
@@ -1758,7 +1759,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = default_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = default_analog,
@@ -1782,7 +1783,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = pinnacle_hybrid_pro_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = pinnacle_hybrid_pro_analog,
@@ -1808,7 +1809,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1834,7 +1835,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1859,7 +1860,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = hauppauge_wintv_hvr_900_analog,
@@ -1904,7 +1905,7 @@ struct em28xx_board em28xx_boards[] = {
                         .gpio     = kworld_330u_analog,
                         .aout     = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = kworld_330u_analog,
@@ -1951,7 +1952,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
 
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1970,7 +1971,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,
                 .decoder      = EM28XX_SAA711X,
                 .input           = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -1990,7 +1991,7 @@ struct em28xx_board em28xx_boards[] = {
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, { /* Composite has not been tested yet */
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_VIDEO,
                 }, { /* S-video has not been tested yet */
@@ -2006,7 +2007,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder         = EM28XX_SAA711X,
                 .xclk            = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input           = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -2023,7 +2024,7 @@ struct em28xx_board em28xx_boards[] = {
                 .xclk            = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .mute_gpio       = terratec_av350_mute_gpio,
                 .input           = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AUDIO_SRC_LINE,
                         .gpio     = terratec_av350_unmute_gpio,
@@ -2041,7 +2042,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA711X,
                 .tuner_type   = TUNER_ABSENT,   /* Capture only device */
                 .input        = { {
-                        .type  = EM28XX_VMUX_COMPOSITE1,
+                        .type  = EM28XX_VMUX_COMPOSITE,
                         .vmux  = SAA7115_COMPOSITE0,
                         .amux  = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -2067,7 +2068,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = evga_indtube_analog,
                 }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                         .gpio     = evga_indtube_analog,
@@ -2125,7 +2126,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type          = TUNER_ABSENT,
                 .decoder             = EM28XX_SAA711X,
                 .input               = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = SAA7115_COMPOSITE0,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -2238,7 +2239,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_ABSENT,
                 .is_webcam    = 1,
                 .input        = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .amux     = EM28XX_AMUX_VIDEO,
                         .gpio     = speedlink_vad_laplace_reg_seq,
                 } },
@@ -2272,7 +2273,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type    = TUNER_ABSENT,  /* Capture only device */
                 .decoder       = EM28XX_TVP5150,
                 .input         = { {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .type     = EM28XX_VMUX_COMPOSITE,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
@@ -3012,6 +3013,41 @@ static void flush_request_modules(struct em28xx *dev)
         flush_work(&dev->request_module_wk);
 }
 
+static int em28xx_media_device_init(struct em28xx *dev,
+                                    struct usb_device *udev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev;
+
+        if (udev->product) {
+                mdev = v4l2_mc_usb_media_device_init(udev, udev->product);
+        } else if (udev->manufacturer) {
+                mdev = v4l2_mc_usb_media_device_init(udev, udev->manufacturer);
+        } else {
+                mdev = v4l2_mc_usb_media_device_init(udev, dev->name);
+        }
+
+        if (!mdev)
+                return -ENOMEM;
+
+        dev->media_dev = mdev;
+#endif
+        return 0;
+}
+
+static void em28xx_unregister_media_device(struct em28xx *dev)
+{
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        if (dev->media_dev) {
+                media_device_unregister(dev->media_dev);
+                media_device_cleanup(dev->media_dev);
+                kfree(dev->media_dev);
+                dev->media_dev = NULL;
+        }
+#endif
+}
+
 /*
  * em28xx_release_resources()
  * unregisters the v4l2,i2c and usb devices
@@ -3023,6 +3059,8 @@ static void em28xx_release_resources(struct em28xx *dev)
 
         mutex_lock(&dev->lock);
 
+        em28xx_unregister_media_device(dev);
+
         if (dev->def_i2c_bus)
                 em28xx_i2c_unregister(dev, 1);
         em28xx_i2c_unregister(dev, 0);
@@ -3167,6 +3205,8 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
          */
         snprintf(dev->name, sizeof(dev->name), "%s #%d", chip_name, dev->devno);
 
+        em28xx_media_device_init(dev, udev);
+
         if (dev->is_audio_only) {
                 retval = em28xx_audio_setup(dev);
                 if (retval)
@@ -3467,7 +3507,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, dev);
 
-        /* allocate device struct */
+        /* allocate device struct and check if the device is a webcam */
         mutex_init(&dev->lock);
         retval = em28xx_init_dev(dev, udev, interface, nr);
         if (retval) {
@@ -3483,6 +3523,15 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 try_bulk = usb_xfer_mode > 0;
         }
 
+        /* Disable V4L2 if the device doesn't have a decoder */
+        if (has_video &&
+            dev->board.decoder == EM28XX_NODECODER && !dev->board.is_webcam) {
+                printk(DRIVER_NAME
+                       ": Currently, V4L2 is not supported on this model\n");
+                has_video = false;
+                dev->has_video = false;
+        }
+
         /* Select USB transfer types to use */
         if (has_video) {
                 if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
@@ -3501,9 +3550,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
         request_modules(dev);
 
-        /* Should be the last thing to do, to avoid newer udev's to
-           open the device before fully initializing it
+        /*
+         * Do it at the end, to reduce dynamic configuration changes during
+         * the device init. Yet, as request_modules() can be async, the
+         * topology will likely change after the load of the em28xx subdrivers.
          */
+#ifdef CONFIG_MEDIA_CONTROLLER
+        retval = media_device_register(dev->media_dev);
+#endif
 
         return 0;
 
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index bf5c24467c65..5d209c7c54d5 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -905,6 +905,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
                                struct em28xx *dev, struct device *device)
 {
         int result;
+        bool create_rf_connector = false;
 
         mutex_init(&dvb->lock);
 
@@ -916,6 +917,9 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
                        dev->name, result);
                 goto fail_adapter;
         }
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+        dvb->adapter.mdev = dev->media_dev;
+#endif
 
         /* Ensure all frontends negotiate bus access */
         dvb->fe[0]->ops.ts_bus_ctrl = em28xx_dvb_bus_ctrl;
@@ -994,8 +998,19 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
 
         /* register network adapter */
         dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
+
+        /* If the analog part won't create RF connectors, DVB will do it */
+        if (!dev->has_video || (dev->tuner_type == TUNER_ABSENT))
+                create_rf_connector = true;
+
+        result = dvb_create_media_graph(&dvb->adapter, create_rf_connector);
+        if (result < 0)
+                goto fail_create_graph;
+
         return 0;
 
+fail_create_graph:
+        dvb_net_release(&dvb->net);
 fail_fe_conn:
         dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
 fail_fe_mem:
@@ -1656,6 +1671,9 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         memset(&si2157_config, 0, sizeof(si2157_config));
                         si2157_config.fe = dvb->fe[0];
                         si2157_config.if_port = 1;
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+                        si2157_config.mdev = dev->media_dev;
+#endif
                         memset(&info, 0, sizeof(struct i2c_board_info));
                         strlcpy(info.type, "si2157", I2C_NAME_SIZE);
                         info.addr = 0x60;
@@ -1717,6 +1735,9 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         memset(&si2157_config, 0, sizeof(si2157_config));
                         si2157_config.fe = dvb->fe[0];
                         si2157_config.if_port = 0;
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+                        si2157_config.mdev = dev->media_dev;
+#endif
                         memset(&info, 0, sizeof(struct i2c_board_info));
                         strlcpy(info.type, "si2146", I2C_NAME_SIZE);
                         info.addr = 0x60;
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 0e86ff423c49..f772e2612608 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -196,7 +196,6 @@ static void em28xx_wake_i2c(struct em28xx *dev)
         v4l2_device_call_all(v4l2_dev, 0, core,  reset, 0);
         v4l2_device_call_all(v4l2_dev, 0, video, s_routing,
                              INPUT(dev->ctl_input)->vmux, 0, 0);
-        v4l2_device_call_all(v4l2_dev, 0, video, s_stream, 0);
 }
 
 static int em28xx_colorlevels_set_default(struct em28xx *dev)
@@ -867,6 +866,147 @@ static void res_free(struct em28xx *dev, enum v4l2_buf_type f_type)
         em28xx_videodbg("res: put %d\n", res_type);
 }
 
+static void em28xx_v4l2_media_release(struct em28xx *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        int i;
+
+        for (i = 0; i < MAX_EM28XX_INPUT; i++) {
+                if (!INPUT(i)->type)
+                        return;
+                media_device_unregister_entity(&dev->input_ent[i]);
+        }
+#endif
+}
+
+/*
+ * Media Controller helper functions
+ */
+
+static int em28xx_enable_analog_tuner(struct em28xx *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev = dev->media_dev;
+        struct em28xx_v4l2 *v4l2 = dev->v4l2;
+        struct media_entity *source;
+        struct media_link *link, *found_link = NULL;
+        int ret, active_links = 0;
+
+        if (!mdev || !v4l2->decoder)
+                return 0;
+
+        /*
+         * This will find the tuner that is connected into the decoder.
+         * Technically, this is not 100% correct, as the device may be
+         * using an analog input instead of the tuner. However, as we can't
+         * do DVB streaming while the DMA engine is being used for V4L2,
+         * this should be enough for the actual needs.
+         */
+        list_for_each_entry(link, &v4l2->decoder->links, list) {
+                if (link->sink->entity == v4l2->decoder) {
+                        found_link = link;
+                        if (link->flags & MEDIA_LNK_FL_ENABLED)
+                                active_links++;
+                        break;
+                }
+        }
+
+        if (active_links == 1 || !found_link)
+                return 0;
+
+        source = found_link->source->entity;
+        list_for_each_entry(link, &source->links, list) {
+                struct media_entity *sink;
+                int flags = 0;
+
+                sink = link->sink->entity;
+
+                if (sink == v4l2->decoder)
+                        flags = MEDIA_LNK_FL_ENABLED;
+
+                ret = media_entity_setup_link(link, flags);
+                if (ret) {
+                        pr_err("Couldn't change link %s->%s to %s. Error %d\n",
+                               source->name, sink->name,
+                               flags ? "enabled" : "disabled",
+                               ret);
+                        return ret;
+                } else
+                        em28xx_videodbg("link %s->%s was %s\n",
+                                        source->name, sink->name,
+                                        flags ? "ENABLED" : "disabled");
+        }
+#endif
+        return 0;
+}
+
+static const char * const iname[] = {
+        [EM28XX_VMUX_COMPOSITE]  = "Composite",
+        [EM28XX_VMUX_SVIDEO]     = "S-Video",
+        [EM28XX_VMUX_TELEVISION] = "Television",
+        [EM28XX_RADIO]           = "Radio",
+};
+
+static void em28xx_v4l2_create_entities(struct em28xx *dev)
+{
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct em28xx_v4l2 *v4l2 = dev->v4l2;
+        int ret, i;
+
+        /* Initialize Video, VBI and Radio pads */
+        v4l2->video_pad.flags = MEDIA_PAD_FL_SINK;
+        ret = media_entity_pads_init(&v4l2->vdev.entity, 1, &v4l2->video_pad);
+        if (ret < 0)
+                pr_err("failed to initialize video media entity!\n");
+
+        if (em28xx_vbi_supported(dev)) {
+                v4l2->vbi_pad.flags = MEDIA_PAD_FL_SINK;
+                ret = media_entity_pads_init(&v4l2->vbi_dev.entity, 1,
+                                             &v4l2->vbi_pad);
+                if (ret < 0)
+                        pr_err("failed to initialize vbi media entity!\n");
+        }
+
+        /* Webcams don't have input connectors */
+        if (dev->board.is_webcam)
+                return;
+
+        /* Create entities for each input connector */
+        for (i = 0; i < MAX_EM28XX_INPUT; i++) {
+                struct media_entity *ent = &dev->input_ent[i];
+
+                if (!INPUT(i)->type)
+                        break;
+
+                ent->name = iname[INPUT(i)->type];
+                ent->flags = MEDIA_ENT_FL_CONNECTOR;
+                dev->input_pad[i].flags = MEDIA_PAD_FL_SOURCE;
+
+                switch (INPUT(i)->type) {
+                case EM28XX_VMUX_COMPOSITE:
+                        ent->function = MEDIA_ENT_F_CONN_COMPOSITE;
+                        break;
+                case EM28XX_VMUX_SVIDEO:
+                        ent->function = MEDIA_ENT_F_CONN_SVIDEO;
+                        break;
+                default: /* EM28XX_VMUX_TELEVISION or EM28XX_RADIO */
+                        if (dev->tuner_type != TUNER_ABSENT)
+                                ent->function = MEDIA_ENT_F_CONN_RF;
+                        break;
+                }
+
+                ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
+                if (ret < 0)
+                        pr_err("failed to initialize input pad[%d]!\n", i);
+
+                ret = media_device_register_entity(dev->media_dev, ent);
+                if (ret < 0)
+                        pr_err("failed to register input entity %d!\n", i);
+        }
+#endif
+}
+
+
 /* ------------------------------------------------------------------
         Videobuf2 operations
    ------------------------------------------------------------------*/
@@ -884,6 +1024,9 @@ static int queue_setup(struct vb2_queue *vq,
                 return sizes[0] < size ? -EINVAL : 0;
         *nplanes = 1;
         sizes[0] = size;
+
+        em28xx_enable_analog_tuner(dev);
+
         return 0;
 }
 
@@ -962,6 +1105,9 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
                         f.type = V4L2_TUNER_ANALOG_TV;
                 v4l2_device_call_all(&v4l2->v4l2_dev,
                                      0, tuner, s_frequency, &f);
+
+                /* Enable video stream at TV decoder */
+                v4l2_device_call_all(&v4l2->v4l2_dev, 0, video, s_stream, 1);
         }
 
         v4l2->streaming_users++;
@@ -981,6 +1127,9 @@ static void em28xx_stop_streaming(struct vb2_queue *vq)
         res_free(dev, vq->type);
 
         if (v4l2->streaming_users-- == 1) {
+                /* Disable video stream at TV decoder */
+                v4l2_device_call_all(&v4l2->v4l2_dev, 0, video, s_stream, 0);
+
                 /* Last active user, so shutdown all the URBS */
                 em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
         }
@@ -1013,6 +1162,9 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
         res_free(dev, vq->type);
 
         if (v4l2->streaming_users-- == 1) {
+                /* Disable video stream at TV decoder */
+                v4l2_device_call_all(&v4l2->v4l2_dev, 0, video, s_stream, 0);
+
                 /* Last active user, so shutdown all the URBS */
                 em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
         }
@@ -1224,6 +1376,12 @@ static void scale_to_size(struct em28xx *dev,
 
         *width = (((unsigned long)maxw) << 12) / (hscale + 4096L);
         *height = (((unsigned long)maxh) << 12) / (vscale + 4096L);
+
+        /* Don't let width or height to be zero */
+        if (*width < 1)
+                *width = 1;
+        if (*height < 1)
+                *height = 1;
 }
 
 /* ------------------------------------------------------------------
@@ -1299,6 +1457,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                 v4l_bound_align_image(&width, 48, maxw, 1, &height, 32, maxh,
                                       1, 0);
         }
+        /* Avoid division by zero at size_to_scale */
+        if (width < 1)
+                width = 1;
+        if (height < 1)
+                height = 1;
 
         size_to_scale(dev, width, height, &hscale, &vscale);
         scale_to_size(dev, hscale, vscale, &width, &height);
@@ -1434,18 +1597,6 @@ static int vidioc_s_parm(struct file *file, void *priv,
                                           0, video, s_parm, p);
 }
 
-static const char *iname[] = {
-        [EM28XX_VMUX_COMPOSITE1] = "Composite1",
-        [EM28XX_VMUX_COMPOSITE2] = "Composite2",
-        [EM28XX_VMUX_COMPOSITE3] = "Composite3",
-        [EM28XX_VMUX_COMPOSITE4] = "Composite4",
-        [EM28XX_VMUX_SVIDEO]     = "S-Video",
-        [EM28XX_VMUX_TELEVISION] = "Television",
-        [EM28XX_VMUX_CABLE]      = "Cable TV",
-        [EM28XX_VMUX_DVB]        = "DVB",
-        [EM28XX_VMUX_DEBUG]      = "for debug only",
-};
-
 static int vidioc_enum_input(struct file *file, void *priv,
                              struct v4l2_input *i)
 {
@@ -1463,8 +1614,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
 
         strcpy(i->name, iname[INPUT(n)->type]);
 
-        if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) ||
-            (EM28XX_VMUX_CABLE == INPUT(n)->type))
+        if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type))
                 i->type = V4L2_INPUT_TYPE_TUNER;
 
         i->std = dev->v4l2->vdev.tvnorms;
@@ -1961,6 +2111,8 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
 
         em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
 
+        em28xx_v4l2_media_release(dev);
+
         if (video_is_registered(&v4l2->radio_dev)) {
                 em28xx_info("V4L2 device %s deregistered\n",
                             video_device_node_name(&v4l2->radio_dev));
@@ -2284,6 +2436,9 @@ static int em28xx_v4l2_init(struct em28xx *dev)
         v4l2->dev = dev;
         dev->v4l2 = v4l2;
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+        v4l2->v4l2_dev.mdev = dev->media_dev;
+#endif
         ret = v4l2_device_register(&dev->udev->dev, &v4l2->v4l2_dev);
         if (ret < 0) {
                 em28xx_errdev("Call to v4l2_device_register() failed!\n");
@@ -2556,6 +2711,16 @@ static int em28xx_v4l2_init(struct em28xx *dev)
                             video_device_node_name(&v4l2->radio_dev));
         }
 
+        /* Init entities at the Media Controller */
+        em28xx_v4l2_create_entities(dev);
+
+        ret = v4l2_mc_create_media_graph(dev->media_dev);
+        if (ret) {
+                em28xx_errdev("failed to create media graph\n");
+                em28xx_v4l2_media_release(dev);
+                goto unregister_dev;
+        }
+
         em28xx_info("V4L2 video device registered as %s\n",
                     video_device_node_name(&v4l2->vdev));
 
@@ -2577,6 +2742,22 @@ static int em28xx_v4l2_init(struct em28xx *dev)
         return 0;
 
 unregister_dev:
+        if (video_is_registered(&v4l2->radio_dev)) {
+                em28xx_info("V4L2 device %s deregistered\n",
+                            video_device_node_name(&v4l2->radio_dev));
+                video_unregister_device(&v4l2->radio_dev);
+        }
+        if (video_is_registered(&v4l2->vbi_dev)) {
+                em28xx_info("V4L2 device %s deregistered\n",
+                            video_device_node_name(&v4l2->vbi_dev));
+                video_unregister_device(&v4l2->vbi_dev);
+        }
+        if (video_is_registered(&v4l2->vdev)) {
+                em28xx_info("V4L2 device %s deregistered\n",
+                            video_device_node_name(&v4l2->vdev));
+                video_unregister_device(&v4l2->vdev);
+        }
+
         v4l2_ctrl_handler_free(&v4l2->ctrl_handler);
         v4l2_device_unregister(&v4l2->v4l2_dev);
 err:
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 8ff066c977d9..267444961775 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -26,7 +26,7 @@
 #ifndef _EM28XX_H
 #define _EM28XX_H
 
-#define EM28XX_VERSION "0.2.1"
+#define EM28XX_VERSION "0.2.2"
 #define DRIVER_DESC    "Empia em28xx device driver"
 
 #include <linux/workqueue.h>
@@ -291,15 +291,9 @@ struct em28xx_dmaqueue {
 
 #define MAX_EM28XX_INPUT 4
 enum enum28xx_itype {
-        EM28XX_VMUX_COMPOSITE1 = 1,
-        EM28XX_VMUX_COMPOSITE2,
-        EM28XX_VMUX_COMPOSITE3,
-        EM28XX_VMUX_COMPOSITE4,
+        EM28XX_VMUX_COMPOSITE = 1,
         EM28XX_VMUX_SVIDEO,
         EM28XX_VMUX_TELEVISION,
-        EM28XX_VMUX_CABLE,
-        EM28XX_VMUX_DVB,
-        EM28XX_VMUX_DEBUG,
         EM28XX_RADIO,
 };
 
@@ -558,6 +552,11 @@ struct em28xx_v4l2 {
         bool top_field;
         int vbi_read;
         unsigned int field_count;
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_pad video_pad, vbi_pad;
+        struct media_entity *decoder;
+#endif
 };
 
 struct em28xx_audio {
@@ -718,6 +717,12 @@ struct em28xx {
         /* Snapshot button input device */
         char snapshot_button_path[30];  /* path of the input dev */
         struct input_dev *sbutton_input_dev;
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *media_dev;
+        struct media_entity input_ent[MAX_EM28XX_INPUT];
+        struct media_pad input_pad[MAX_EM28XX_INPUT];
+#endif
 };
 
 #define kref_to_dev(d) container_of(d, struct em28xx, ref)
diff --git a/drivers/media/usb/go7007/go7007-priv.h b/drivers/media/usb/go7007/go7007-priv.h
index 745185eb060b..bebee8ca9981 100644
--- a/drivers/media/usb/go7007/go7007-priv.h
+++ b/drivers/media/usb/go7007/go7007-priv.h
@@ -250,7 +250,7 @@ struct go7007 {
         struct i2c_adapter i2c_adapter;
 
         /* HPI driver */
-        struct go7007_hpi_ops *hpi_ops;
+        const struct go7007_hpi_ops *hpi_ops;
         void *hpi_context;
         int interrupt_available;
         wait_queue_head_t interrupt_waitq;
diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
index 3dbf14c85c5c..14d3f8c1ce4a 100644
--- a/drivers/media/usb/go7007/go7007-usb.c
+++ b/drivers/media/usb/go7007/go7007-usb.c
@@ -932,7 +932,7 @@ static void go7007_usb_release(struct go7007 *go)
         kfree(go->hpi_context);
 }
 
-static struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {
+static const struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {
         .interface_reset        = go7007_usb_interface_reset,
         .write_interrupt        = go7007_usb_ezusb_write_interrupt,
         .read_interrupt         = go7007_usb_read_interrupt,
@@ -942,7 +942,7 @@ static struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {
         .release                = go7007_usb_release,
 };
 
-static struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = {
+static const struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = {
         .interface_reset        = go7007_usb_interface_reset,
         .write_interrupt        = go7007_usb_onboard_write_interrupt,
         .read_interrupt         = go7007_usb_read_interrupt,
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 3fc64197b4e6..08f0ca7aa012 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -273,7 +273,9 @@ static int hdpvr_probe(struct usb_interface *interface,
         struct hdpvr_device *dev;
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
+#if IS_ENABLED(CONFIG_I2C)
         struct i2c_client *client;
+#endif
         size_t buffer_size;
         int i;
         int retval = -ENOMEM;
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 7dee22deebf3..ba7f02270c83 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -462,10 +462,8 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count,
                         }
 
                         if (wait_event_interruptible(dev->wait_data,
-                                              buf->status == BUFSTAT_READY)) {
-                                ret = -ERESTARTSYS;
-                                goto err;
-                        }
+                                              buf->status == BUFSTAT_READY))
+                                return -ERESTARTSYS;
                 }
 
                 if (buf->status != BUFSTAT_READY)
diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index c104315fdc17..2d33033682af 100644
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -839,8 +839,6 @@ static int msi2500_set_usb_adc(struct msi2500_dev *dev)
                 goto err;
 
         ret = msi2500_ctrl_msg(dev, CMD_WREG, reg3);
-        if (ret)
-                goto err;
 err:
         return ret;
 }
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c
index fd888a604462..c45f30715dcd 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c
@@ -196,7 +196,7 @@ int pvr2_context_global_init(void)
         pvr2_context_thread_ptr = kthread_run(pvr2_context_thread_func,
                                               NULL,
                                               "pvrusb2-context");
-        return (pvr2_context_thread_ptr ? 0 : -ENOMEM);
+        return IS_ERR(pvr2_context_thread_ptr) ? -ENOMEM : 0;
 }
 
 
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index 086cf1c7bd7d..18aed5dd325e 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -91,6 +91,7 @@ static const struct usb_device_id pwc_device_table [] = {
         { USB_DEVICE(0x0471, 0x0312) },
         { USB_DEVICE(0x0471, 0x0313) }, /* the 'new' 720K */
         { USB_DEVICE(0x0471, 0x0329) }, /* Philips SPC 900NC PC Camera */
+        { USB_DEVICE(0x0471, 0x032C) }, /* Philips SPC 880NC PC Camera */
         { USB_DEVICE(0x069A, 0x0001) }, /* Askey */
         { USB_DEVICE(0x046D, 0x08B0) }, /* Logitech QuickCam Pro 3000 */
         { USB_DEVICE(0x046D, 0x08B1) }, /* Logitech QuickCam Notebook Pro */
@@ -810,6 +811,11 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                         name = "Philips SPC 900NC webcam";
                         type_id = 740;
                         break;
+                case 0x032C:
+                        PWC_INFO("Philips SPC 880NC USB webcam detected.\n");
+                        name = "Philips SPC 880NC webcam";
+                        type_id = 740;
+                        break;
                 default:
                         return -ENODEV;
                         break;
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 8abbd3cc8eba..4dac499ed28e 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <media/v4l2-mc.h>
 
 #include "sms-cards.h"
 #include "smsendian.h"
@@ -51,6 +52,9 @@ struct smsusb_urb_t {
         struct smsusb_device_t *dev;
 
         struct urb urb;
+
+        /* For the bottom half */
+        struct work_struct wq;
 };
 
 struct smsusb_device_t {
@@ -71,6 +75,18 @@ static int smsusb_submit_urb(struct smsusb_device_t *dev,
                              struct smsusb_urb_t *surb);
 
 /**
+ * Completing URB's callback handler - bottom half (proccess context)
+ * submits the URB prepared on smsusb_onresponse()
+ */
+static void do_submit_urb(struct work_struct *work)
+{
+        struct smsusb_urb_t *surb = container_of(work, struct smsusb_urb_t, wq);
+        struct smsusb_device_t *dev = surb->dev;
+
+        smsusb_submit_urb(dev, surb);
+}
+
+/**
  * Completing URB's callback handler - top half (interrupt context)
  * adds completing sms urb to the global surbs list and activtes the worker
  * thread the surb
@@ -138,13 +154,15 @@ static void smsusb_onresponse(struct urb *urb)
 
 
 exit_and_resubmit:
-        smsusb_submit_urb(dev, surb);
+        INIT_WORK(&surb->wq, do_submit_urb);
+        schedule_work(&surb->wq);
 }
 
 static int smsusb_submit_urb(struct smsusb_device_t *dev,
                              struct smsusb_urb_t *surb)
 {
         if (!surb->cb) {
+                /* This function can sleep */
                 surb->cb = smscore_getbuffer(dev->coredev);
                 if (!surb->cb) {
                         pr_err("smscore_getbuffer(...) returned NULL\n");
@@ -349,20 +367,10 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
         struct sms_board *board = sms_get_board(board_id);
         int ret;
 
-        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        mdev = v4l2_mc_usb_media_device_init(udev, board->name);
         if (!mdev)
                 return NULL;
 
-        mdev->dev = &udev->dev;
-        strlcpy(mdev->model, board->name, sizeof(mdev->model));
-        if (udev->serial)
-                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
-        strcpy(mdev->bus_info, udev->devpath);
-        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
-        mdev->driver_version = LINUX_VERSION_CODE;
-
-        media_device_init(mdev);
-
         ret = media_device_register(mdev);
         if (ret) {
                 media_device_cleanup(mdev);
diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c
index 46191d5262eb..6ecb0b48423f 100644
--- a/drivers/media/usb/stk1160/stk1160-video.c
+++ b/drivers/media/usb/stk1160/stk1160-video.c
@@ -98,7 +98,6 @@ void stk1160_buffer_done(struct stk1160 *dev)
 
         buf->vb.sequence = dev->sequence++;
         buf->vb.field = V4L2_FIELD_INTERLACED;
-        buf->vb.vb2_buf.planes[0].bytesused = buf->bytesused;
         buf->vb.vb2_buf.timestamp = ktime_get_ns();
 
         vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->bytesused);
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 4ebb33943f9a..f6cfad46547e 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -312,20 +312,24 @@ static void usbtv_image_chunk(struct usbtv *usbtv, __be32 *chunk)
         usbtv_chunk_to_vbuf(frame, &chunk[1], chunk_no, odd);
         usbtv->chunks_done++;
 
-        /* Last chunk in a frame, signalling an end */
-        if (odd && chunk_no == usbtv->n_chunks-1) {
-                int size = vb2_plane_size(&buf->vb.vb2_buf, 0);
-                enum vb2_buffer_state state = usbtv->chunks_done ==
-                                                usbtv->n_chunks ?
-                                                VB2_BUF_STATE_DONE :
-                                                VB2_BUF_STATE_ERROR;
-
-                buf->vb.field = V4L2_FIELD_INTERLACED;
-                buf->vb.sequence = usbtv->sequence++;
-                buf->vb.vb2_buf.timestamp = ktime_get_ns();
-                vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
-                vb2_buffer_done(&buf->vb.vb2_buf, state);
-                list_del(&buf->list);
+        /* Last chunk in a field */
+        if (chunk_no == usbtv->n_chunks-1) {
+                /* Last chunk in a frame, signalling an end */
+                if (odd && !usbtv->last_odd) {
+                        int size = vb2_plane_size(&buf->vb.vb2_buf, 0);
+                        enum vb2_buffer_state state = usbtv->chunks_done ==
+                                usbtv->n_chunks ?
+                                VB2_BUF_STATE_DONE :
+                                VB2_BUF_STATE_ERROR;
+
+                        buf->vb.field = V4L2_FIELD_INTERLACED;
+                        buf->vb.sequence = usbtv->sequence++;
+                        buf->vb.vb2_buf.timestamp = ktime_get_ns();
+                        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
+                        vb2_buffer_done(&buf->vb.vb2_buf, state);
+                        list_del(&buf->list);
+                }
+                usbtv->last_odd = odd;
         }
 
         spin_unlock_irqrestore(&usbtv->buflock, flags);
@@ -389,6 +393,10 @@ static struct urb *usbtv_setup_iso_transfer(struct usbtv *usbtv)
         ip->transfer_flags = URB_ISO_ASAP;
         ip->transfer_buffer = kzalloc(size * USBTV_ISOC_PACKETS,
                                                 GFP_KERNEL);
+        if (!ip->transfer_buffer) {
+                usb_free_urb(ip);
+                return NULL;
+        }
         ip->complete = usbtv_iso_cb;
         ip->number_of_packets = USBTV_ISOC_PACKETS;
         ip->transfer_buffer_length = size * USBTV_ISOC_PACKETS;
@@ -639,6 +647,7 @@ static int usbtv_start_streaming(struct vb2_queue *vq, unsigned int count)
         if (usbtv->udev == NULL)
                 return -ENODEV;
 
+        usbtv->last_odd = 1;
         usbtv->sequence = 0;
         return usbtv_start(usbtv);
 }
diff --git a/drivers/media/usb/usbtv/usbtv.h b/drivers/media/usb/usbtv/usbtv.h
index 19cb8bf7c4e9..161b38d5cfa0 100644
--- a/drivers/media/usb/usbtv/usbtv.h
+++ b/drivers/media/usb/usbtv/usbtv.h
@@ -95,6 +95,7 @@ struct usbtv {
         int width, height;
         int n_chunks;
         int iso_size;
+        int last_odd;
         unsigned int sequence;
         struct urb *isoc_urbs[USBTV_ISOC_TRANSFERS];
 
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index de9ff3bb8edd..12f5ebbd0436 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -162,8 +162,7 @@ MODULE_ALIAS(DRIVER_ALIAS);
 
 static inline struct usb_usbvision *cd_to_usbvision(struct device *cd)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         return video_get_drvdata(vdev);
 }
 
@@ -177,8 +176,7 @@ static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
 static ssize_t show_model(struct device *cd,
                           struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        usbvision_device_data[usbvision->dev_model].model_string);
@@ -188,8 +186,7 @@ static DEVICE_ATTR(model, S_IRUGO, show_model, NULL);
 static ssize_t show_hue(struct device *cd,
                         struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_HUE;
@@ -203,8 +200,7 @@ static DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL);
 static ssize_t show_contrast(struct device *cd,
                              struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_CONTRAST;
@@ -218,8 +214,7 @@ static DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL);
 static ssize_t show_brightness(struct device *cd,
                                struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_BRIGHTNESS;
@@ -233,8 +228,7 @@ static DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL);
 static ssize_t show_saturation(struct device *cd,
                                struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_SATURATION;
@@ -248,8 +242,7 @@ static DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL);
 static ssize_t show_streaming(struct device *cd,
                               struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        YES_NO(usbvision->streaming == stream_on ? 1 : 0));
@@ -259,8 +252,7 @@ static DEVICE_ATTR(streaming, S_IRUGO, show_streaming, NULL);
 static ssize_t show_compression(struct device *cd,
                                 struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        YES_NO(usbvision->isoc_mode == ISOC_MODE_COMPRESS));
@@ -270,8 +262,7 @@ static DEVICE_ATTR(compression, S_IRUGO, show_compression, NULL);
 static ssize_t show_device_bridge(struct device *cd,
                                   struct device_attribute *attr, char *buf)
 {
-        struct video_device *vdev =
-                container_of(cd, struct video_device, dev);
+        struct video_device *vdev = to_video_device(cd);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%d\n", usbvision->bridge_type);
 }
@@ -1156,6 +1147,7 @@ static int usbvision_radio_close(struct file *file)
         usbvision_audio_off(usbvision);
         usbvision->radio = 0;
         usbvision->user--;
+        mutex_unlock(&usbvision->v4l2_lock);
 
         if (usbvision->remove_pending) {
                 printk(KERN_INFO "%s: Final disconnect\n", __func__);
@@ -1164,7 +1156,6 @@ static int usbvision_radio_close(struct file *file)
                 return 0;
         }
 
-        mutex_unlock(&usbvision->v4l2_lock);
         PDEBUG(DBG_IO, "success");
         return v4l2_fh_release(file);
 }
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 9beece00869b..29b3436d0910 100644
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -37,7 +37,6 @@ config VIDEO_PCI_SKELETON
 # Used by drivers that need tuner.ko
 config VIDEO_TUNER
         tristate
-        depends on MEDIA_TUNER
 
 # Used by drivers that need v4l2-mem2mem.ko
 config V4L2_MEM2MEM_DEV
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 1dc8bba2b198..795a5352761d 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -16,6 +16,7 @@ endif
 ifeq ($(CONFIG_TRACEPOINTS),y)
   videodev-objs += vb2-trace.o v4l2-trace.o
 endif
+videodev-$(CONFIG_MEDIA_CONTROLLER) += v4l2-mc.o
 
 obj-$(CONFIG_VIDEO_V4L2) += videodev.o
 obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 76496fd282aa..731487be5baa 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -696,16 +696,32 @@ static int tuner_probe(struct i2c_client *client,
         /* Should be just before return */
 register_client:
 #if defined(CONFIG_MEDIA_CONTROLLER)
-        t->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
-        t->pad[TUNER_PAD_IF_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
-        t->sd.entity.function = MEDIA_ENT_F_TUNER;
         t->sd.entity.name = t->name;
+        /*
+         * Handle the special case where the tuner has actually
+         * two stages: the PLL to tune into a frequency and the
+         * IF-PLL demodulator (tda988x).
+         */
+        if (t->type == TUNER_TDA9887) {
+                t->pad[IF_VID_DEC_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+                t->pad[IF_VID_DEC_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE;
+                ret = media_entity_pads_init(&t->sd.entity,
+                                             IF_VID_DEC_PAD_NUM_PADS,
+                                             &t->pad[0]);
+                t->sd.entity.function = MEDIA_ENT_F_IF_VID_DECODER;
+        } else {
+                t->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
+                t->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
+                t->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;
+                ret = media_entity_pads_init(&t->sd.entity, TUNER_NUM_PADS,
+                                             &t->pad[0]);
+                t->sd.entity.function = MEDIA_ENT_F_TUNER;
+        }
 
-        ret = media_entity_pads_init(&t->sd.entity, TUNER_NUM_PADS, &t->pad[0]);
         if (ret < 0) {
                 tuner_err("failed to initialize media entity!\n");
                 kfree(t);
-                return -ENODEV;
+                return ret;
         }
 #endif
         /* Sets a default mode */
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 5bada202b2d3..a4b224d92572 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -119,6 +119,13 @@ static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
                 return ret;
         }
 
+        ret = v4l2_subdev_call(sd, core, registered_async);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                if (notifier->unbind)
+                        notifier->unbind(notifier, sd, asd);
+                return ret;
+        }
+
         if (list_empty(&notifier->waiting) && notifier->complete)
                 return notifier->complete(notifier);
 
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 8fd84a67478a..019644ff627d 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -415,7 +415,8 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
                 get_user(kp->index, &up->index) ||
                 get_user(kp->type, &up->type) ||
                 get_user(kp->flags, &up->flags) ||
-                get_user(kp->memory, &up->memory))
+                get_user(kp->memory, &up->memory) ||
+                get_user(kp->length, &up->length))
                         return -EFAULT;
 
         if (V4L2_TYPE_IS_OUTPUT(kp->type))
@@ -427,9 +428,6 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
                         return -EFAULT;
 
         if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
-                if (get_user(kp->length, &up->length))
-                        return -EFAULT;
-
                 num_planes = kp->length;
                 if (num_planes == 0) {
                         kp->m.planes = NULL;
@@ -462,16 +460,14 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
         } else {
                 switch (kp->memory) {
                 case V4L2_MEMORY_MMAP:
-                        if (get_user(kp->length, &up->length) ||
-                                get_user(kp->m.offset, &up->m.offset))
+                        if (get_user(kp->m.offset, &up->m.offset))
                                 return -EFAULT;
                         break;
                 case V4L2_MEMORY_USERPTR:
                         {
                         compat_long_t tmp;
 
-                        if (get_user(kp->length, &up->length) ||
-                            get_user(tmp, &up->m.userptr))
+                        if (get_user(tmp, &up->m.userptr))
                                 return -EFAULT;
 
                         kp->m.userptr = (unsigned long)compat_ptr(tmp);
@@ -513,7 +509,8 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
                 copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) ||
                 put_user(kp->sequence, &up->sequence) ||
                 put_user(kp->reserved2, &up->reserved2) ||
-                put_user(kp->reserved, &up->reserved))
+                put_user(kp->reserved, &up->reserved) ||
+                put_user(kp->length, &up->length))
                         return -EFAULT;
 
         if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
@@ -536,13 +533,11 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
         } else {
                 switch (kp->memory) {
                 case V4L2_MEMORY_MMAP:
-                        if (put_user(kp->length, &up->length) ||
-                                put_user(kp->m.offset, &up->m.offset))
+                        if (put_user(kp->m.offset, &up->m.offset))
                                 return -EFAULT;
                         break;
                 case V4L2_MEMORY_USERPTR:
-                        if (put_user(kp->length, &up->length) ||
-                                put_user(kp->m.userptr, &up->m.userptr))
+                        if (put_user(kp->m.userptr, &up->m.userptr))
                                 return -EFAULT;
                         break;
                 case V4L2_MEMORY_OVERLAY:
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index c9d5537b6af7..8b321e0aae62 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -462,6 +462,14 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                 "RGB full range (0-255)",
                 NULL,
         };
+        static const char * const dv_it_content_type[] = {
+                "Graphics",
+                "Photo",
+                "Cinema",
+                "Game",
+                "No IT Content",
+                NULL,
+        };
         static const char * const detect_md_mode[] = {
                 "Disabled",
                 "Global",
@@ -560,6 +568,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
         case V4L2_CID_DV_TX_RGB_RANGE:
         case V4L2_CID_DV_RX_RGB_RANGE:
                 return dv_rgb_range;
+        case V4L2_CID_DV_TX_IT_CONTENT_TYPE:
+        case V4L2_CID_DV_RX_IT_CONTENT_TYPE:
+                return dv_it_content_type;
         case V4L2_CID_DETECT_MD_MODE:
                 return detect_md_mode;
 
@@ -747,6 +758,7 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE:             return "Horizontal MV Search Range";
         case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:             return "Vertical MV Search Range";
         case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER:             return "Repeat Sequence Header";
+        case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:               return "Force Key Frame";
 
         /* VPX controls */
         case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS:            return "VPX Number of Partitions";
@@ -881,8 +893,10 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_DV_TX_EDID_PRESENT:       return "EDID Present";
         case V4L2_CID_DV_TX_MODE:               return "Transmit Mode";
         case V4L2_CID_DV_TX_RGB_RANGE:          return "Tx RGB Quantization Range";
+        case V4L2_CID_DV_TX_IT_CONTENT_TYPE:    return "Tx IT Content Type";
         case V4L2_CID_DV_RX_POWER_PRESENT:      return "Power Present";
         case V4L2_CID_DV_RX_RGB_RANGE:          return "Rx RGB Quantization Range";
+        case V4L2_CID_DV_RX_IT_CONTENT_TYPE:    return "Rx IT Content Type";
 
         case V4L2_CID_FM_RX_CLASS:              return "FM Radio Receiver Controls";
         case V4L2_CID_TUNE_DEEMPHASIS:          return "De-Emphasis";
@@ -985,6 +999,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:
                 *type = V4L2_CTRL_TYPE_INTEGER;
                 break;
+        case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
         case V4L2_CID_PAN_RESET:
         case V4L2_CID_TILT_RESET:
         case V4L2_CID_FLASH_STROBE:
@@ -1038,7 +1053,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_SCENE_MODE:
         case V4L2_CID_DV_TX_MODE:
         case V4L2_CID_DV_TX_RGB_RANGE:
+        case V4L2_CID_DV_TX_IT_CONTENT_TYPE:
         case V4L2_CID_DV_RX_RGB_RANGE:
+        case V4L2_CID_DV_RX_IT_CONTENT_TYPE:
         case V4L2_CID_TEST_PATTERN:
         case V4L2_CID_TUNE_DEEMPHASIS:
         case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL:
@@ -1185,6 +1202,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_DV_TX_RXSENSE:
         case V4L2_CID_DV_TX_EDID_PRESENT:
         case V4L2_CID_DV_RX_POWER_PRESENT:
+        case V4L2_CID_DV_RX_IT_CONTENT_TYPE:
         case V4L2_CID_RDS_RX_PTY:
         case V4L2_CID_RDS_RX_PS_NAME:
         case V4L2_CID_RDS_RX_RADIO_TEXT:
@@ -2211,22 +2229,6 @@ struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl,
 }
 EXPORT_SYMBOL(v4l2_ctrl_new_int_menu);
 
-/* Add a control from another handler to this handler */
-struct v4l2_ctrl *v4l2_ctrl_add_ctrl(struct v4l2_ctrl_handler *hdl,
-                                          struct v4l2_ctrl *ctrl)
-{
-        if (hdl == NULL || hdl->error)
-                return NULL;
-        if (ctrl == NULL) {
-                handler_set_err(hdl, -EINVAL);
-                return NULL;
-        }
-        if (ctrl->handler == hdl)
-                return ctrl;
-        return handler_new_ref(hdl, ctrl) ? NULL : ctrl;
-}
-EXPORT_SYMBOL(v4l2_ctrl_add_ctrl);
-
 /* Add the controls from another handler to our own. */
 int v4l2_ctrl_add_handler(struct v4l2_ctrl_handler *hdl,
                           struct v4l2_ctrl_handler *add,
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index ec258b73001a..889de0a32152 100644
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -165,7 +165,8 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,
             bt->width > cap->max_width ||
             bt->pixelclock < cap->min_pixelclock ||
             bt->pixelclock > cap->max_pixelclock ||
-            (cap->standards && bt->standards &&
+            (!(caps & V4L2_DV_BT_CAP_CUSTOM) &&
+             cap->standards && bt->standards &&
              !(bt->standards & cap->standards)) ||
             (bt->interlaced && !(caps & V4L2_DV_BT_CAP_INTERLACED)) ||
             (!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE)))
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 8a018c6dd16a..14843090fd61 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1191,6 +1191,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
         case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break;
         case V4L2_PIX_FMT_YUV420M:      descr = "Planar YUV 4:2:0 (N-C)"; break;
         case V4L2_PIX_FMT_YVU420M:      descr = "Planar YVU 4:2:0 (N-C)"; break;
+        case V4L2_PIX_FMT_YUV422M:      descr = "Planar YUV 4:2:2 (N-C)"; break;
+        case V4L2_PIX_FMT_YVU422M:      descr = "Planar YVU 4:2:2 (N-C)"; break;
+        case V4L2_PIX_FMT_YUV444M:      descr = "Planar YUV 4:4:4 (N-C)"; break;
+        case V4L2_PIX_FMT_YVU444M:      descr = "Planar YVU 4:4:4 (N-C)"; break;
         case V4L2_PIX_FMT_SBGGR8:       descr = "8-bit Bayer BGBG/GRGR"; break;
         case V4L2_PIX_FMT_SGBRG8:       descr = "8-bit Bayer GBGB/RGRG"; break;
         case V4L2_PIX_FMT_SGRBG8:       descr = "8-bit Bayer GRGR/BGBG"; break;
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
new file mode 100644
index 000000000000..a7f41b323522
--- /dev/null
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -0,0 +1,258 @@
+/*
+ * Media Controller ancillary functions
+ *
+ * (c) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/usb.h>
+#include <media/media-entity.h>
+#include <media/v4l2-mc.h>
+
+
+struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
+                                                   const char *name)
+{
+#ifdef CONFIG_PCI
+        struct media_device *mdev;
+
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        if (!mdev)
+                return NULL;
+
+        mdev->dev = &pci_dev->dev;
+
+        if (name)
+                strlcpy(mdev->model, name, sizeof(mdev->model));
+        else
+                strlcpy(mdev->model, pci_name(pci_dev), sizeof(mdev->model));
+
+        sprintf(mdev->bus_info, "PCI:%s", pci_name(pci_dev));
+
+        mdev->hw_revision = pci_dev->subsystem_vendor << 16
+                            || pci_dev->subsystem_device;
+
+        mdev->driver_version = LINUX_VERSION_CODE;
+
+        media_device_init(mdev);
+
+        return mdev;
+#else
+        return NULL;
+#endif
+}
+EXPORT_SYMBOL_GPL(v4l2_mc_pci_media_device_init);
+
+struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
+                                                     const char *board_name,
+                                                     const char *driver_name)
+{
+#ifdef CONFIG_USB
+        struct media_device *mdev;
+
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        if (!mdev)
+                return NULL;
+
+        mdev->dev = &udev->dev;
+
+        if (driver_name)
+                strlcpy(mdev->driver_name, driver_name,
+                        sizeof(mdev->driver_name));
+
+        if (board_name)
+                strlcpy(mdev->model, board_name, sizeof(mdev->model));
+        else if (udev->product)
+                strlcpy(mdev->model, udev->product, sizeof(mdev->model));
+        else
+                strlcpy(mdev->model, "unknown model", sizeof(mdev->model));
+        if (udev->serial)
+                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
+        usb_make_path(udev, mdev->bus_info, sizeof(mdev->bus_info));
+        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
+        mdev->driver_version = LINUX_VERSION_CODE;
+
+        media_device_init(mdev);
+
+        return mdev;
+#else
+        return NULL;
+#endif
+}
+EXPORT_SYMBOL_GPL(__v4l2_mc_usb_media_device_init);
+
+int v4l2_mc_create_media_graph(struct media_device *mdev)
+
+{
+        struct media_entity *entity;
+        struct media_entity *if_vid = NULL, *if_aud = NULL;
+        struct media_entity *tuner = NULL, *decoder = NULL;
+        struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL;
+        bool is_webcam = false;
+        u32 flags;
+        int ret;
+
+        if (!mdev)
+                return 0;
+
+        media_device_for_each_entity(entity, mdev) {
+                switch (entity->function) {
+                case MEDIA_ENT_F_IF_VID_DECODER:
+                        if_vid = entity;
+                        break;
+                case MEDIA_ENT_F_IF_AUD_DECODER:
+                        if_aud = entity;
+                        break;
+                case MEDIA_ENT_F_TUNER:
+                        tuner = entity;
+                        break;
+                case MEDIA_ENT_F_ATV_DECODER:
+                        decoder = entity;
+                        break;
+                case MEDIA_ENT_F_IO_V4L:
+                        io_v4l = entity;
+                        break;
+                case MEDIA_ENT_F_IO_VBI:
+                        io_vbi = entity;
+                        break;
+                case MEDIA_ENT_F_IO_SWRADIO:
+                        io_swradio = entity;
+                        break;
+                case MEDIA_ENT_F_CAM_SENSOR:
+                        is_webcam = true;
+                        break;
+                }
+        }
+
+        /* It should have at least one I/O entity */
+        if (!io_v4l && !io_vbi && !io_swradio)
+                return -EINVAL;
+
+        /*
+         * Here, webcams are modelled on a very simple way: the sensor is
+         * connected directly to the I/O entity. All dirty details, like
+         * scaler and crop HW are hidden. While such mapping is not enough
+         * for mc-centric hardware, it is enough for v4l2 interface centric
+         * PC-consumer's hardware.
+         */
+        if (is_webcam) {
+                if (!io_v4l)
+                        return -EINVAL;
+
+                media_device_for_each_entity(entity, mdev) {
+                        if (entity->function != MEDIA_ENT_F_CAM_SENSOR)
+                                continue;
+                        ret = media_create_pad_link(entity, 0,
+                                                    io_v4l, 0,
+                                                    MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                }
+                if (!decoder)
+                        return 0;
+        }
+
+        /* The device isn't a webcam. So, it should have a decoder */
+        if (!decoder)
+                return -EINVAL;
+
+        /* Link the tuner and IF video output pads */
+        if (tuner) {
+                if (if_vid) {
+                        ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
+                                                    if_vid,
+                                                    IF_VID_DEC_PAD_IF_INPUT,
+                                                    MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                        ret = media_create_pad_link(if_vid, IF_VID_DEC_PAD_OUT,
+                                                decoder, DEMOD_PAD_IF_INPUT,
+                                                MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                } else {
+                        ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
+                                                decoder, DEMOD_PAD_IF_INPUT,
+                                                MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                }
+
+                if (if_aud) {
+                        ret = media_create_pad_link(tuner, TUNER_PAD_AUD_OUT,
+                                                    if_aud,
+                                                    IF_AUD_DEC_PAD_IF_INPUT,
+                                                    MEDIA_LNK_FL_ENABLED);
+                        if (ret)
+                                return ret;
+                } else {
+                        if_aud = tuner;
+                }
+
+        }
+
+        /* Create demod to V4L, VBI and SDR radio links */
+        if (io_v4l) {
+                ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT,
+                                        io_v4l, 0,
+                                        MEDIA_LNK_FL_ENABLED);
+                if (ret)
+                        return ret;
+        }
+
+        if (io_swradio) {
+                ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT,
+                                        io_swradio, 0,
+                                        MEDIA_LNK_FL_ENABLED);
+                if (ret)
+                        return ret;
+        }
+
+        if (io_vbi) {
+                ret = media_create_pad_link(decoder, DEMOD_PAD_VBI_OUT,
+                                            io_vbi, 0,
+                                            MEDIA_LNK_FL_ENABLED);
+                if (ret)
+                        return ret;
+        }
+
+        /* Create links for the media connectors */
+        flags = MEDIA_LNK_FL_ENABLED;
+        media_device_for_each_entity(entity, mdev) {
+                switch (entity->function) {
+                case MEDIA_ENT_F_CONN_RF:
+                        if (!tuner)
+                                continue;
+
+                        ret = media_create_pad_link(entity, 0, tuner,
+                                                    TUNER_PAD_RF_INPUT,
+                                                    flags);
+                        break;
+                case MEDIA_ENT_F_CONN_SVIDEO:
+                case MEDIA_ENT_F_CONN_COMPOSITE:
+                        ret = media_create_pad_link(entity, 0, decoder,
+                                                    DEMOD_PAD_IF_INPUT,
+                                                    flags);
+                        break;
+                default:
+                        continue;
+                }
+                if (ret)
+                        return ret;
+
+                flags = 0;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_mc_create_media_graph);
diff --git a/drivers/media/v4l2-core/v4l2-of.c b/drivers/media/v4l2-core/v4l2-of.c
index b27cbb1f5afe..93b33681776c 100644
--- a/drivers/media/v4l2-core/v4l2-of.c
+++ b/drivers/media/v4l2-core/v4l2-of.c
@@ -146,7 +146,7 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node,
  * variable without a low fixed limit. Please use
  * v4l2_of_alloc_parse_endpoint() in new drivers instead.
  *
- * Return: 0.
+ * Return: 0 on success or a negative error code on failure.
  */
 int v4l2_of_parse_endpoint(const struct device_node *node,
                            struct v4l2_of_endpoint *endpoint)
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index ff8953ae52d1..dab94080ec3a 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1227,6 +1227,7 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const void *pb)
                 if (planes[plane].length < vb->planes[plane].min_length) {
                         dprintk(1, "invalid dmabuf length for plane %d\n",
                                 plane);
+                        dma_buf_put(dbuf);
                         ret = -EINVAL;
                         goto err;
                 }
diff --git a/drivers/media/v4l2-core/videobuf2-dvb.c b/drivers/media/v4l2-core/videobuf2-dvb.c
index d09269846b7e..9f38b4218c0d 100644
--- a/drivers/media/v4l2-core/videobuf2-dvb.c
+++ b/drivers/media/v4l2-core/videobuf2-dvb.c
@@ -77,6 +77,7 @@ static int vb2_dvb_register_adapter(struct vb2_dvb_frontends *fe,
                           struct module *module,
                           void *adapter_priv,
                           struct device *device,
+                          struct media_device *mdev,
                           char *adapter_name,
                           short *adapter_nr,
                           int mfe_shared)
@@ -94,7 +95,10 @@ static int vb2_dvb_register_adapter(struct vb2_dvb_frontends *fe,
         }
         fe->adapter.priv = adapter_priv;
         fe->adapter.mfe_shared = mfe_shared;
-
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+        if (mdev)
+                fe->adapter.mdev = mdev;
+#endif
         return result;
 }
 
@@ -193,6 +197,7 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f,
                          struct module *module,
                          void *adapter_priv,
                          struct device *device,
+                         struct media_device *mdev,
                          short *adapter_nr,
                          int mfe_shared)
 {
@@ -207,7 +212,7 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f,
         }
 
         /* Bring up the adapter */
-        res = vb2_dvb_register_adapter(f, module, adapter_priv, device,
+        res = vb2_dvb_register_adapter(f, module, adapter_priv, device, mdev,
                 fe->dvb.name, adapter_nr, mfe_shared);
         if (res < 0) {
                 pr_warn("vb2_dvb_register_adapter failed (errno = %d)\n", res);
@@ -224,7 +229,11 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f,
                                 fe->dvb.name, res);
                         goto err;
                 }
+                res = dvb_create_media_graph(&f->adapter, false);
+                if (res < 0)
+                        goto err;
         }
+
         mutex_unlock(&f->lock);
         return 0;
 
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 14697686eea5..d48a5c29c417 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -31,6 +31,8 @@ source "drivers/staging/media/mn88473/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"
 
+source "drivers/staging/media/timb/Kconfig"
+
 # Keep LIRC at the end, as it has sub-menus
 source "drivers/staging/media/lirc/Kconfig"
 
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 34c557b4c6d6..fb94f045c40f 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)       += omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/
+obj-$(CONFIG_VIDEO_TIMBERDALE)  += timb/
diff --git a/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h b/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
index 7b7e7b26c1e8..3cc9be776f8b 100644
--- a/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
+++ b/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
@@ -538,7 +538,7 @@ struct vpfe_isif_raw_config {
 };
 
 /**********************************************************************
-      IPIPE API Structures
+*      IPIPE API Structures
 **********************************************************************/
 
 /* IPIPE module configurations */
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 3ec7e65a3ffa..db49af90217e 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
         mutex_lock(&mdev->graph_mutex);
         ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
         if (ret) {
-                mutex_unlock(&video->lock);
+                mutex_unlock(&mdev->graph_mutex);
                 return -ENOMEM;
         }
         media_entity_graph_walk_start(&graph, entity);
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index d009bcb439f0..68ede6c56e6d 100644
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -193,7 +193,7 @@ static int lirc_claim(void)
                         return 0;
                 }
         }
-        out(LIRC_LP_CONTROL, LP_PSELECP|LP_PINITP);
+        out(LIRC_LP_CONTROL, LP_PSELECP | LP_PINITP);
         is_claimed = 1;
         return 1;
 }
@@ -264,7 +264,7 @@ static void lirc_lirc_irq_handler(void *blah)
                 init = 1;
         }
 
-        timeout = timer/10;     /* timeout after 1/10 sec. */
+        timeout = timer / 10;   /* timeout after 1/10 sec. */
         signal = 1;
         level = lirc_get_timer();
         do {
@@ -286,15 +286,15 @@ static void lirc_lirc_irq_handler(void *blah)
                 /* adjust value to usecs */
                 __u64 helper;
 
-                helper = ((__u64) signal)*1000000;
+                helper = ((__u64)signal) * 1000000;
                 do_div(helper, timer);
-                signal = (long) helper;
+                signal = (long)helper;
 
                 if (signal > LIRC_SFH506_DELAY)
                         data = signal - LIRC_SFH506_DELAY;
                 else
                         data = 1;
-                rbuf_write(PULSE_BIT|data); /* pulse */
+                rbuf_write(PULSE_BIT | data); /* pulse */
         }
         lastkt = ktime_get();
 #else
@@ -331,7 +331,7 @@ static ssize_t lirc_read(struct file *filep, char __user *buf, size_t n,
         set_current_state(TASK_INTERRUPTIBLE);
         while (count < n) {
                 if (rptr != wptr) {
-                        if (copy_to_user(buf+count, &rbuf[rptr],
+                        if (copy_to_user(buf + count, &rbuf[rptr],
                                          sizeof(int))) {
                                 result = -EFAULT;
                                 break;
@@ -393,9 +393,9 @@ static ssize_t lirc_write(struct file *filep, const char __user *buf, size_t n,
         for (i = 0; i < count; i++) {
                 __u64 helper;
 
-                helper = ((__u64) wbuf[i])*timer;
+                helper = ((__u64)wbuf[i]) * timer;
                 do_div(helper, 1000000);
-                wbuf[i] = (int) helper;
+                wbuf[i] = (int)helper;
         }
 
         local_irq_save(flags);
@@ -647,7 +647,7 @@ static int __init lirc_parallel_init(void)
                 goto exit_device_put;
 
         pport = parport_find_base(io);
-        if (pport == NULL) {
+        if (!pport) {
                 pr_notice("no port at %x found\n", io);
                 result = -ENXIO;
                 goto exit_device_put;
@@ -656,7 +656,7 @@ static int __init lirc_parallel_init(void)
                                            pf, kf, lirc_lirc_irq_handler, 0,
                                            NULL);
         parport_put_port(pport);
-        if (ppdevice == NULL) {
+        if (!ppdevice) {
                 pr_notice("parport_register_device() failed\n");
                 result = -ENXIO;
                 goto exit_device_put;
@@ -664,7 +664,7 @@ static int __init lirc_parallel_init(void)
         if (parport_claim(ppdevice) != 0)
                 goto skip_init;
         is_claimed = 1;
-        out(LIRC_LP_CONTROL, LP_PSELECP|LP_PINITP);
+        out(LIRC_LP_CONTROL, LP_PSELECP | LP_PINITP);
 
 #ifdef LIRC_TIMER
         if (debug)
@@ -730,7 +730,7 @@ module_param(irq, int, S_IRUGO);
 MODULE_PARM_DESC(irq, "Interrupt (7 or 5)");
 
 module_param(tx_mask, int, S_IRUGO);
-MODULE_PARM_DESC(tx_maxk, "Transmitter mask (default: 0x01)");
+MODULE_PARM_DESC(tx_mask, "Transmitter mask (default: 0x01)");
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/staging/media/timb/Kconfig b/drivers/staging/media/timb/Kconfig
new file mode 100644
index 000000000000..e413fecc1e67
--- /dev/null
+++ b/drivers/staging/media/timb/Kconfig
@@ -0,0 +1,11 @@
+config VIDEO_TIMBERDALE
+        tristate "Support for timberdale Video In/LogiWIN"
+        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && HAS_DMA
+        depends on (MFD_TIMBERDALE && TIMB_DMA) || COMPILE_TEST
+        select VIDEO_ADV7180
+        select VIDEOBUF_DMA_CONTIG
+        ---help---
+          Add support for the Video In peripherial of the timberdale FPGA.
+
+          This driver is deprecated and will be removed soon unless someone
+          will start the work to convert this driver to the vb2 framework.
diff --git a/drivers/staging/media/timb/Makefile b/drivers/staging/media/timb/Makefile
new file mode 100644
index 000000000000..4c989c23a0e0
--- /dev/null
+++ b/drivers/staging/media/timb/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_TIMBERDALE)  += timblogiw.o
diff --git a/drivers/media/platform/timblogiw.c b/drivers/staging/media/timb/timblogiw.c
index 113c9f3c0b3e..113c9f3c0b3e 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/staging/media/timb/timblogiw.c
diff --git a/include/media/i2c/tvp5150.h b/include/dt-bindings/media/tvp5150.h
index 649908a25605..c852a35e916e 100644
--- a/include/media/i2c/tvp5150.h
+++ b/include/dt-bindings/media/tvp5150.h
@@ -18,16 +18,18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef _TVP5150_H_
-#define _TVP5150_H_
+#ifndef _DT_BINDINGS_MEDIA_TVP5150_H
+#define _DT_BINDINGS_MEDIA_TVP5150_H
 
 /* TVP5150 HW inputs */
 #define TVP5150_COMPOSITE0 0
 #define TVP5150_COMPOSITE1 1
 #define TVP5150_SVIDEO     2
 
+#define TVP5150_INPUT_NUM  3
+
 /* TVP5150 HW outputs */
 #define TVP5150_NORMAL       0
 #define TVP5150_BLACK_SCREEN 1
 
-#endif
+#endif /* _DT_BINDINGS_MEDIA_TVP5150_H */
diff --git a/include/media/media-device.h b/include/media/media-device.h
index d3855898c3fc..165451bc3985 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -268,6 +268,10 @@ struct device;
  * struct media_device - Media device
  * @dev:        Parent device
  * @devnode:    Media device node
+ * @driver_name: Optional device driver name. If not set, calls to
+ *              %MEDIA_IOC_DEVICE_INFO will return dev->driver->name.
+ *              This is needed for USB drivers for example, as otherwise
+ *              they'll all appear as if the driver name was "usb".
  * @model:      Device model name
  * @serial:     Device serial number (optional)
  * @bus_info:   Unique and stable device location identifier
@@ -303,6 +307,7 @@ struct media_device {
         struct media_devnode devnode;
 
         char model[32];
+        char driver_name[32];
         char serial[40];
         char bus_info[32];
         u32 hw_revision;
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index f6494709e230..c41dd7018fa8 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -60,6 +60,7 @@ enum rc_filter_type {
 /**
  * struct rc_dev - represents a remote control device
  * @dev: driver model's view of this device
+ * @initialized: true if the device init has completed
  * @sysfs_groups: sysfs attribute groups
  * @input_name: name of the input child device
  * @input_phys: physical path to the input child device
@@ -121,6 +122,7 @@ enum rc_filter_type {
  */
 struct rc_dev {
         struct device                   dev;
+        bool                            initialized;
         const struct attribute_group    *sysfs_groups[5];
         const char                      *input_name;
         const char                      *input_phys;
diff --git a/include/media/tuner.h b/include/media/tuner.h
index e5321fda5489..b3edc14e763f 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -20,14 +20,7 @@
 #ifdef __KERNEL__
 
 #include <linux/videodev2.h>
-
-/* Tuner PADs */
-/* FIXME: is this the right place for it? */
-enum tuner_pad_index {
-        TUNER_PAD_RF_INPUT,
-        TUNER_PAD_IF_OUTPUT,
-        TUNER_NUM_PADS
-};
+#include <media/v4l2-mc.h>
 
 #define ADDR_UNSET (255)
 
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index da6fe9802fee..0bc9b35b8f3e 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -535,18 +535,6 @@ struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl,
                         u32 id, u8 max, u8 def, const s64 *qmenu_int);
 
 /**
- * v4l2_ctrl_add_ctrl() - Add a control from another handler to this handler.
- * @hdl:        The control handler.
- * @ctrl:       The control to add.
- *
- * It will return NULL if it was unable to add the control reference.
- * If the control already belonged to the handler, then it will do
- * nothing and just return @ctrl.
- */
-struct v4l2_ctrl *v4l2_ctrl_add_ctrl(struct v4l2_ctrl_handler *hdl,
-                                          struct v4l2_ctrl *ctrl);
-
-/**
  * v4l2_ctrl_add_handler() - Add all controls from handler @add to
  * handler @hdl.
  * @hdl:        The control handler.
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
new file mode 100644
index 000000000000..79d84bb3573c
--- /dev/null
+++ b/include/media/v4l2-mc.h
@@ -0,0 +1,172 @@
+/*
+ * v4l2-mc.h - Media Controller V4L2 types and prototypes
+ *
+ * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _V4L2_MC_H
+#define _V4L2_MC_H
+
+#include <media/media-device.h>
+
+/**
+ * enum tuner_pad_index - tuner pad index for MEDIA_ENT_F_TUNER
+ *
+ * @TUNER_PAD_RF_INPUT: Radiofrequency (RF) sink pad, usually linked to a
+ *                      RF connector entity.
+ * @TUNER_PAD_OUTPUT:   Tuner video output source pad. Contains the video
+ *                      chrominance and luminance or the hole bandwidth
+ *                      of the signal converted to an Intermediate Frequency
+ *                      (IF) or to baseband (on zero-IF tuners).
+ * @TUNER_PAD_AUD_OUT:  Tuner audio output source pad. Tuners used to decode
+ *                      analog TV signals have an extra pad for audio output.
+ *                      Old tuners use an analog stage with a saw filter for
+ *                      the audio IF frequency. The output of the pad is, in
+ *                      this case, the audio IF, with should be decoded either
+ *                      by the bridge chipset (that's the case of cx2388x
+ *                      chipsets) or may require an external IF sound
+ *                      processor, like msp34xx. On modern silicon tuners,
+ *                      the audio IF decoder is usually incorporated at the
+ *                      tuner. On such case, the output of this pad is an
+ *                      audio sampled data.
+ * @TUNER_NUM_PADS:     Number of pads of the tuner.
+ */
+enum tuner_pad_index {
+        TUNER_PAD_RF_INPUT,
+        TUNER_PAD_OUTPUT,
+        TUNER_PAD_AUD_OUT,
+        TUNER_NUM_PADS
+};
+
+/**
+ * enum if_vid_dec_index - video IF-PLL pad index for
+ *                         MEDIA_ENT_F_IF_VID_DECODER
+ *
+ * @IF_VID_DEC_PAD_IF_INPUT:    video Intermediate Frequency (IF) sink pad
+ * @IF_VID_DEC_PAD_OUT:         IF-PLL video output source pad. Contains the
+ *                              video chrominance and luminance IF signals.
+ * @IF_VID_DEC_PAD_NUM_PADS:    Number of pads of the video IF-PLL.
+ */
+enum if_vid_dec_pad_index {
+        IF_VID_DEC_PAD_IF_INPUT,
+        IF_VID_DEC_PAD_OUT,
+        IF_VID_DEC_PAD_NUM_PADS
+};
+
+/**
+ * enum if_aud_dec_index - audio/sound IF-PLL pad index for
+ *                         MEDIA_ENT_F_IF_AUD_DECODER
+ *
+ * @IF_AUD_DEC_PAD_IF_INPUT:    audio Intermediate Frequency (IF) sink pad
+ * @IF_AUD_DEC_PAD_OUT:         IF-PLL audio output source pad. Contains the
+ *                              audio sampled stream data, usually connected
+ *                              to the bridge bus via an Inter-IC Sound (I2S)
+ *                              bus.
+ * @IF_AUD_DEC_PAD_NUM_PADS:    Number of pads of the audio IF-PLL.
+ */
+enum if_aud_dec_pad_index {
+        IF_AUD_DEC_PAD_IF_INPUT,
+        IF_AUD_DEC_PAD_OUT,
+        IF_AUD_DEC_PAD_NUM_PADS
+};
+
+/**
+ * enum demod_pad_index - analog TV pad index for MEDIA_ENT_F_ATV_DECODER
+ *
+ * @DEMOD_PAD_IF_INPUT: IF input sink pad.
+ * @DEMOD_PAD_VID_OUT:  Video output source pad.
+ * @DEMOD_PAD_VBI_OUT:  Vertical Blank Interface (VBI) output source pad.
+ * @DEMOD_NUM_PADS:     Maximum number of output pads.
+ */
+enum demod_pad_index {
+        DEMOD_PAD_IF_INPUT,
+        DEMOD_PAD_VID_OUT,
+        DEMOD_PAD_VBI_OUT,
+        DEMOD_NUM_PADS
+};
+
+/* We don't need to include pci.h or usb.h here */
+struct pci_dev;
+struct usb_device;
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+/**
+ * v4l2_mc_create_media_graph() - create Media Controller links at the graph.
+ *
+ * @mdev:       pointer to the &media_device struct.
+ *
+ * Add links between the entities commonly found on PC customer's hardware at
+ * the V4L2 side: camera sensors, audio and video PLL-IF decoders, tuners,
+ * analog TV decoder and I/O entities (video, VBI and Software Defined Radio).
+ * NOTE: webcams are modelled on a very simple way: the sensor is
+ * connected directly to the I/O entity. All dirty details, like
+ * scaler and crop HW are hidden. While such mapping is enough for v4l2
+ * interface centric PC-consumer's hardware, V4L2 subdev centric camera
+ * hardware should not use this routine, as it will not build the right graph.
+ */
+int v4l2_mc_create_media_graph(struct media_device *mdev);
+
+/**
+ * v4l2_mc_pci_media_device_init() - create and initialize a
+ *      struct &media_device from a PCI device.
+ *
+ * @pci_dev:    pointer to struct pci_dev
+ * @name:       media device name. If %NULL, the routine will use the default
+ *              name for the pci device, given by pci_name() macro.
+ */
+struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
+                                                   const char *name);
+/**
+ * __v4l2_mc_usb_media_device_init() - create and initialize a
+ *      struct &media_device from a PCI device.
+ *
+ * @udev:       pointer to struct usb_device
+ * @board_name: media device name. If %NULL, the routine will use the usb
+ *              product name, if available.
+ * @driver_name: name of the driver. if %NULL, the routine will use the name
+ *              given by udev->dev->driver->name, with is usually the wrong
+ *              thing to do.
+ *
+ * NOTE: It is better to call v4l2_mc_usb_media_device_init() instead, as
+ * such macro fills driver_name with %KBUILD_MODNAME.
+ */
+struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
+                                                     const char *board_name,
+                                                     const char *driver_name);
+
+#else
+static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
+{
+        return 0;
+}
+
+static inline
+struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
+                                                   char *name)
+{
+        return NULL;
+}
+
+static inline
+struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
+                                                     char *board_name,
+                                                     char *driver_name)
+{
+        return NULL;
+}
+#endif
+
+#define v4l2_mc_usb_media_device_init(udev, name) \
+        __v4l2_mc_usb_media_device_init(udev, name, KBUILD_MODNAME)
+
+#endif
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index b273cf9ac047..11e2dfec0198 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -179,6 +179,8 @@ struct v4l2_subdev_io_pin_config {
  *                   for it to be warned when the value of a control changes.
  *
  * @unsubscribe_event: remove event subscription from the control framework.
+ *
+ * @registered_async: the subdevice has been registered async.
  */
 struct v4l2_subdev_core_ops {
         int (*log_status)(struct v4l2_subdev *sd);
@@ -211,6 +213,7 @@ struct v4l2_subdev_core_ops {
                                struct v4l2_event_subscription *sub);
         int (*unsubscribe_event)(struct v4l2_subdev *sd, struct v4l2_fh *fh,
                                  struct v4l2_event_subscription *sub);
+        int (*registered_async)(struct v4l2_subdev *sd);
 };
 
 /**
diff --git a/include/media/videobuf2-dvb.h b/include/media/videobuf2-dvb.h
index 5b64c9eac2c9..87b559024b4a 100644
--- a/include/media/videobuf2-dvb.h
+++ b/include/media/videobuf2-dvb.h
@@ -8,6 +8,10 @@
 #include <dvb_frontend.h>
 
 #include <media/videobuf2-v4l2.h>
+
+/* We don't actually need to include media-device.h here */
+struct media_device;
+
 /*
  * TODO: This header file should be replaced with videobuf2-core.h
  * Currently, vb2_thread is not a stuff of videobuf2-core,
@@ -50,6 +54,7 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f,
                          struct module *module,
                          void *adapter_priv,
                          struct device *device,
+                         struct media_device *mdev,
                          short *adapter_nr,
                          int mfe_shared);
 
diff --git a/include/media/vsp1.h b/include/media/vsp1.h
new file mode 100644
index 000000000000..cc541753896f
--- /dev/null
+++ b/include/media/vsp1.h
@@ -0,0 +1,33 @@
+/*
+ * vsp1.h  --  R-Car VSP1 API
+ *
+ * Copyright (C) 2015 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __MEDIA_VSP1_H__
+#define __MEDIA_VSP1_H__
+
+#include <linux/types.h>
+
+struct device;
+struct v4l2_rect;
+
+int vsp1_du_init(struct device *dev);
+
+int vsp1_du_setup_lif(struct device *dev, unsigned int width,
+                      unsigned int height);
+
+int vsp1_du_atomic_begin(struct device *dev);
+int vsp1_du_atomic_update(struct device *dev, unsigned int rpf, u32 pixelformat,
+                          unsigned int pitch, dma_addr_t mem[2],
+                          const struct v4l2_rect *src,
+                          const struct v4l2_rect *dst);
+int vsp1_du_atomic_flush(struct device *dev);
+
+#endif /* __MEDIA_VSP1_H__ */
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 1e3c8cb43bd7..6aac2f035a5d 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -72,21 +72,28 @@ struct media_device_info {
 #define MEDIA_ENT_F_DTV_NET_DECAP       (MEDIA_ENT_F_BASE + 4)
 
 /*
- * Connectors
+ * I/O entities
  */
-/* It is a responsibility of the entity drivers to add connectors and links */
-#define MEDIA_ENT_F_CONN_RF             (MEDIA_ENT_F_BASE + 21)
-#define MEDIA_ENT_F_CONN_SVIDEO         (MEDIA_ENT_F_BASE + 22)
-#define MEDIA_ENT_F_CONN_COMPOSITE      (MEDIA_ENT_F_BASE + 23)
-/* For internal test signal generators and other debug connectors */
-#define MEDIA_ENT_F_CONN_TEST           (MEDIA_ENT_F_BASE + 24)
+#define MEDIA_ENT_F_IO_DTV              (MEDIA_ENT_F_BASE + 1001)
+#define MEDIA_ENT_F_IO_VBI              (MEDIA_ENT_F_BASE + 1002)
+#define MEDIA_ENT_F_IO_SWRADIO          (MEDIA_ENT_F_BASE + 1003)
 
 /*
- * I/O entities
+ * Analog TV IF-PLL decoders
+ *
+ * It is a responsibility of the master/bridge drivers to create links
+ * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
+ */
+#define MEDIA_ENT_F_IF_VID_DECODER      (MEDIA_ENT_F_BASE + 2001)
+#define MEDIA_ENT_F_IF_AUD_DECODER      (MEDIA_ENT_F_BASE + 2002)
+
+/*
+ * Connectors
  */
-#define MEDIA_ENT_F_IO_DTV              (MEDIA_ENT_F_BASE + 31)
-#define MEDIA_ENT_F_IO_VBI              (MEDIA_ENT_F_BASE + 32)
-#define MEDIA_ENT_F_IO_SWRADIO          (MEDIA_ENT_F_BASE + 33)
+/* It is a responsibility of the entity drivers to add connectors and links */
+#define MEDIA_ENT_F_CONN_RF             (MEDIA_ENT_F_BASE + 10001)
+#define MEDIA_ENT_F_CONN_SVIDEO         (MEDIA_ENT_F_BASE + 10002)
+#define MEDIA_ENT_F_CONN_COMPOSITE      (MEDIA_ENT_F_BASE + 10003)
 
 /*
  * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
@@ -107,8 +114,12 @@ struct media_device_info {
 #define MEDIA_ENT_F_LENS                (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3)
 #define MEDIA_ENT_F_ATV_DECODER         (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)
 /*
- * It is a responsibility of the entity drivers to add connectors and links
- *      for the tuner entities.
+ * It is a responsibility of the master/bridge drivers to add connectors
+ * and links for MEDIA_ENT_F_TUNER. Please notice that some old tuners
+ * may require the usage of separate I2C chips to decode analog TV signals,
+ * when the master/bridge chipset doesn't have its own TV standard decoder.
+ * On such cases, the IF-PLL staging is mapped via one or two entities:
+ * MEDIA_ENT_F_IF_VID_DECODER and/or MEDIA_ENT_F_IF_AUD_DECODER.
  */
 #define MEDIA_ENT_F_TUNER               (MEDIA_ENT_F_OLD_SUBDEV_BASE + 5)
 
@@ -286,7 +297,7 @@ struct media_links_enum {
  *        later, before the adding this API upstream.
  */
 
-#if 0 /* Let's postpone it to Kernel 4.6 */
+
 struct media_v2_entity {
         __u32 id;
         char name[64];          /* FIXME: move to a property? (RFC says so) */
@@ -351,7 +362,6 @@ static inline void __user *media_get_uptr(__u64 arg)
 {
         return (void __user *)(uintptr_t)arg;
 }
-#endif
 
 /* ioctls */
 
@@ -359,9 +369,6 @@ static inline void __user *media_get_uptr(__u64 arg)
 #define MEDIA_IOC_ENUM_ENTITIES         _IOWR('|', 0x01, struct media_entity_desc)
 #define MEDIA_IOC_ENUM_LINKS            _IOWR('|', 0x02, struct media_links_enum)
 #define MEDIA_IOC_SETUP_LINK            _IOWR('|', 0x03, struct media_link_desc)
-
-#if 0 /* Let's postpone it to Kernel 4.6 */
 #define MEDIA_IOC_G_TOPOLOGY            _IOWR('|', 0x04, struct media_v2_topology)
-#endif
 
 #endif /* __LINUX_MEDIA_H */
diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h
index 15273987093e..5b3f685a2d50 100644
--- a/include/uapi/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
@@ -10,19 +10,43 @@
  * Copyright (C) 2012 Nokia Corporation
  * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *  3. The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 2d225bcdb831..b6a357a5f053 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -390,6 +390,7 @@ enum v4l2_mpeg_video_multi_slice_mode {
 #define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER           (V4L2_CID_MPEG_BASE+226)
 #define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE           (V4L2_CID_MPEG_BASE+227)
 #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE           (V4L2_CID_MPEG_BASE+228)
+#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME             (V4L2_CID_MPEG_BASE+229)
 
 #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP             (V4L2_CID_MPEG_BASE+300)
 #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP             (V4L2_CID_MPEG_BASE+301)
@@ -912,8 +913,18 @@ enum v4l2_dv_rgb_range {
         V4L2_DV_RGB_RANGE_FULL    = 2,
 };
 
+#define V4L2_CID_DV_TX_IT_CONTENT_TYPE          (V4L2_CID_DV_CLASS_BASE + 6)
+enum v4l2_dv_it_content_type {
+        V4L2_DV_IT_CONTENT_TYPE_GRAPHICS  = 0,
+        V4L2_DV_IT_CONTENT_TYPE_PHOTO     = 1,
+        V4L2_DV_IT_CONTENT_TYPE_CINEMA    = 2,
+        V4L2_DV_IT_CONTENT_TYPE_GAME      = 3,
+        V4L2_DV_IT_CONTENT_TYPE_NO_ITC    = 4,
+};
+
 #define V4L2_CID_DV_RX_POWER_PRESENT            (V4L2_CID_DV_CLASS_BASE + 100)
 #define V4L2_CID_DV_RX_RGB_RANGE                (V4L2_CID_DV_CLASS_BASE + 101)
+#define V4L2_CID_DV_RX_IT_CONTENT_TYPE          (V4L2_CID_DV_CLASS_BASE + 102)
 
 #define V4L2_CID_FM_RX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_RX | 0x900)
 #define V4L2_CID_FM_RX_CLASS                    (V4L2_CTRL_CLASS_FM_RX | 1)
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 14cd5ebfee6d..466458422385 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -546,6 +546,10 @@ struct v4l2_pix_format {
 /* three non contiguous planes - Y, Cb, Cr */
 #define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
 #define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12  YVU420 planar */
+#define V4L2_PIX_FMT_YUV422M v4l2_fourcc('Y', 'M', '1', '6') /* 16  YUV422 planar */
+#define V4L2_PIX_FMT_YVU422M v4l2_fourcc('Y', 'M', '6', '1') /* 16  YVU422 planar */
+#define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24  YUV444 planar */
+#define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24  YVU444 planar */
 
 /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */