2 files changed, 51 insertions, 3 deletions

diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index ccf6053c1ae4..d5eca4b8f74b 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -138,9 +138,25 @@ applicable values.</para></entry>
         <row>
           <entry>__u32</entry>
           <entry><structfield>flags</structfield></entry>
-            <entry>Flags set by the application or driver, see <xref
+          <entry>Flags set by the application or driver, see <xref
 linkend="format-flags" />.</entry>
         </row>
+        <row>
+          <entry>&v4l2-ycbcr-encoding;</entry>
+          <entry><structfield>ycbcr_enc</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
+        <row>
+          <entry>&v4l2-quantization;</entry>
+          <entry><structfield>quantization</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
       </tbody>
     </tgroup>
   </table>
@@ -232,9 +248,25 @@ codes can be used.</entry>
           <entry>Flags set by the application or driver, see <xref
 linkend="format-flags" />.</entry>
         </row>
+        <row>
+          <entry>&v4l2-ycbcr-encoding;</entry>
+          <entry><structfield>ycbcr_enc</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
+        <row>
+          <entry>&v4l2-quantization;</entry>
+          <entry><structfield>quantization</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
         <row>
           <entry>__u8</entry>
-          <entry><structfield>reserved[10]</structfield></entry>
+          <entry><structfield>reserved[8]</structfield></entry>
           <entry>Reserved for future extensions. Should be zeroed by the
            application.</entry>
         </row>
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 18730b96e1e6..c5ea868e3909 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -34,8 +34,24 @@
           <xref linkend="colorspaces" /> for details.</entry>
         </row>
         <row>
+          <entry>&v4l2-ycbcr-encoding;</entry>
+          <entry><structfield>ycbcr_enc</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
+        <row>
+          <entry>&v4l2-quantization;</entry>
+          <entry><structfield>quantization</structfield></entry>
+          <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+        </row>
+        <row>
           <entry>__u32</entry>
-          <entry><structfield>reserved</structfield>[7]</entry>
+          <entry><structfield>reserved</structfield>[6]</entry>
           <entry>Reserved for future extensions. Applications and drivers must
           set the array to zero.</entry>
         </row>