2 files changed, 12 insertions, 0 deletions

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 576b68b33f2c..116c301656e0 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -272,6 +272,16 @@
             <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_LENS</constant></entry>
             <entry>Lens controller</entry>
           </row>
+          <row>
+            <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_DECODER</constant></entry>
+            <entry>Video decoder, the basic function of the video decoder is to
+            accept analogue video from a wide variety of sources such as
+            broadcast, DVD players, cameras and video cassette recorders, in
+            either NTSC, PAL or HD format and still occasionally SECAM, separate
+            it into its component parts, luminance and chrominance, and output
+            it in some digital video standard, with appropriate embedded timing
+            signals.</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 0ef883327de2..ed49574ad757 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -56,6 +56,8 @@ struct media_device_info {
 #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR  (MEDIA_ENT_T_V4L2_SUBDEV + 1)
 #define MEDIA_ENT_T_V4L2_SUBDEV_FLASH   (MEDIA_ENT_T_V4L2_SUBDEV + 2)
 #define MEDIA_ENT_T_V4L2_SUBDEV_LENS    (MEDIA_ENT_T_V4L2_SUBDEV + 3)
+/* A converter of analogue video to its digital representation. */
+#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER (MEDIA_ENT_T_V4L2_SUBDEV + 4)
 
 #define MEDIA_ENT_FL_DEFAULT            (1 << 0)