3 files changed, 42 insertions, 0 deletions

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 9f5ffd85560b..a7eb1bde8b92 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -4790,6 +4790,40 @@ interface and may change in the future.</para>
             conversion.
             </entry>
           </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_RED</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern red colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENR</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern green (next to red)
+            colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_BLUE</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern blue colour component.
+            </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENB</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Test pattern green (next to blue)
+            colour component.
+            </entry>
+          </row>
           <row><entry></entry></row>
         </tbody>
       </tgroup>
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index f030d6a9e044..35d1f3d5045b 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -859,6 +859,10 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_VBLANK:                   return "Vertical Blanking";
         case V4L2_CID_HBLANK:                   return "Horizontal Blanking";
         case V4L2_CID_ANALOGUE_GAIN:            return "Analogue Gain";
+        case V4L2_CID_TEST_PATTERN_RED:         return "Red Pixel Value";
+        case V4L2_CID_TEST_PATTERN_GREENR:      return "Green (Red) Pixel Value";
+        case V4L2_CID_TEST_PATTERN_BLUE:        return "Blue Pixel Value";
+        case V4L2_CID_TEST_PATTERN_GREENB:      return "Green (Blue) Pixel Value";
 
         /* Image processing controls */
         /* Keep the order of the 'case's the same as in v4l2-controls.h! */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index e946e43fb8d5..8b930210a4b9 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -865,6 +865,10 @@ enum v4l2_jpeg_chroma_subsampling {
 #define V4L2_CID_VBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
 #define V4L2_CID_HBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
 #define V4L2_CID_ANALOGUE_GAIN                  (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
+#define V4L2_CID_TEST_PATTERN_RED               (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 4)
+#define V4L2_CID_TEST_PATTERN_GREENR            (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5)
+#define V4L2_CID_TEST_PATTERN_BLUE              (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)
+#define V4L2_CID_TEST_PATTERN_GREENB            (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)
 
 
 /* Image processing controls */