diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
index 74923d74553589b8d0cdd360fe4e1e84a86aff3b..d2f99e5a3a2f61cf2464a3188023986034a77a86 100644
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
@@ -237,6 +237,7 @@
+
@@ -251,6 +252,7 @@
+
@@ -337,6 +339,7 @@
+
@@ -351,6 +354,7 @@
+
diff --git a/Documentation/DocBook/v4l/pixfmt-nv12m.xml b/Documentation/DocBook/v4l/pixfmt-nv12m.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9e166d9ded8385f6bd7c4372d7dc0978bab3368
--- /dev/null
+++ b/Documentation/DocBook/v4l/pixfmt-nv12m.xml
@@ -0,0 +1,154 @@
+
+
+ V4L2_PIX_FMT_NV12M ('NV12M')
+ &manvol;
+
+
+ V4L2_PIX_FMT_NV12M
+ Variation of V4L2_PIX_FMT_NV12 with planes
+ non contiguous in memory.
+
+
+ Description
+
+ This is a multi-planar, two-plane version of the YUV 4:2:0 format.
+The three components are separated into two sub-images or planes.
+V4L2_PIX_FMT_NV12M differs from V4L2_PIX_FMT_NV12
+ in that the two planes are non-contiguous in memory, i.e. the chroma
+plane do not necessarily immediately follows the luma plane.
+The luminance data occupies the first plane. The Y plane has one byte per pixel.
+In the second plane there is a chrominance data with alternating chroma samples.
+The CbCr plane is the same width, in bytes, as the Y plane (and of the image),
+but is half as tall in pixels. Each CbCr pair belongs to four pixels. For example,
+Cb0/Cr0 belongs to
+Y'00, Y'01,
+Y'10, Y'11.
+
+ V4L2_PIX_FMT_NV12M is intended to be
+used only in drivers and applications that support the multi-planar API,
+described in .
+
+ If the Y plane has pad bytes after each row, then the
+CbCr plane has as many pad bytes after its rows.
+
+
+ <constant>V4L2_PIX_FMT_NV12M</constant> 4 × 4 pixel image
+
+
+ Byte Order.
+ Each cell is one byte.
+
+
+
+
+
+ start0 + 0:
+ Y'00
+ Y'01
+ Y'02
+ Y'03
+
+
+ start0 + 4:
+ Y'10
+ Y'11
+ Y'12
+ Y'13
+
+
+ start0 + 8:
+ Y'20
+ Y'21
+ Y'22
+ Y'23
+
+
+ start0 + 12:
+ Y'30
+ Y'31
+ Y'32
+ Y'33
+
+
+
+
+
+ start1 + 0:
+ Cb00
+ Cr00
+ Cb01
+ Cr01
+
+
+ start1 + 4:
+ Cb10
+ Cr10
+ Cb11
+ Cr11
+
+
+
+
+
+
+
+
+ Color Sample Location.
+
+
+
+
+
+
+ 01
+ 23
+
+
+ 0
+ YY
+ YY
+
+
+
+ C
+ C
+
+
+ 1
+ YY
+ YY
+
+
+
+
+
+ 2
+ YY
+ YY
+
+
+
+ C
+ C
+
+
+ 3
+ YY
+ YY
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Documentation/DocBook/v4l/pixfmt-yuv420m.xml b/Documentation/DocBook/v4l/pixfmt-yuv420m.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5d8f57495c840e9117b480ac68dc3dc5ab8c1b8
--- /dev/null
+++ b/Documentation/DocBook/v4l/pixfmt-yuv420m.xml
@@ -0,0 +1,162 @@
+
+
+ V4L2_PIX_FMT_YUV420M ('YU12M')
+ &manvol;
+
+
+ V4L2_PIX_FMT_YUV420M
+ Variation of V4L2_PIX_FMT_YUV420
+ with planes non contiguous in memory.
+
+
+
+ Description
+
+ This is a multi-planar format, as opposed to a packed format.
+The three components are separated into three sub- images or planes.
+
+The Y plane is first. The Y plane has one byte per pixel. 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,
+Cb0 belongs to Y'00,
+Y'01, Y'10, and
+Y'11. The Cr data, just like the Cb plane, is
+in the third plane.
+
+ 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).
+
+ V4L2_PIX_FMT_NV12M is intended to be
+used only in drivers and applications that support the multi-planar API,
+described in .
+
+
+ <constant>V4L2_PIX_FMT_YVU420M</constant> 4 × 4
+pixel image
+
+
+ Byte Order.
+ Each cell is one byte.
+
+
+
+
+
+ start0 + 0:
+ Y'00
+ Y'01
+ Y'02
+ Y'03
+
+
+ start0 + 4:
+ Y'10
+ Y'11
+ Y'12
+ Y'13
+
+
+ start0 + 8:
+ Y'20
+ Y'21
+ Y'22
+ Y'23
+
+
+ start0 + 12:
+ Y'30
+ Y'31
+ Y'32
+ Y'33
+
+ |
+
+ start1 + 0:
+ Cb00
+ Cb01
+
+
+ start1 + 2:
+ Cb10
+ Cb11
+
+ |
+
+ start2 + 0:
+ Cr00
+ Cr01
+
+
+ start2 + 2:
+ Cr10
+ Cr11
+
+
+
+
+
+
+
+
+ Color Sample Location.
+
+
+
+
+
+
+ 01
+ 23
+
+
+ 0
+ YY
+ YY
+
+
+
+ C
+ C
+
+
+ 1
+ YY
+ YY
+
+
+
+
+
+ 2
+ YY
+ YY
+
+
+
+ C
+ C
+
+
+ 3
+ YY
+ YY
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml
index 28f9c700f752e2f7d6bebbedff50c66a03e63888..f8436dcb7414f3de38231bbd0fb2989f36cc7abb 100644
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
@@ -703,10 +703,12 @@ information.
&sub-vyuy;
&sub-y41p;
&sub-yuv420;
+ &sub-yuv420m;
&sub-yuv410;
&sub-yuv422p;
&sub-yuv411p;
&sub-nv12;
+ &sub-nv12m;
&sub-nv16;