3 files changed, 13 insertions, 0 deletions

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 272a5f718509..a84a08ca51dc 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -4267,6 +4267,16 @@ interface and may change in the future.</para>
             pixels / second.
             </entry>
           </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN</constant></entry>
+            <entry>menu</entry>
+          </row>
+          <row id="v4l2-test-pattern">
+            <entry spanname="descr"> Some capture/display/sensor devices have
+            the capability to generate test pattern images. These hardware
+            specific test patterns can be used to test if a device is working
+            properly.</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 631cdc0e0bda..0bcef2b52cb1 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -749,6 +749,7 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_IMAGE_PROC_CLASS:         return "Image Processing Controls";
         case V4L2_CID_LINK_FREQ:                return "Link Frequency";
         case V4L2_CID_PIXEL_RATE:               return "Pixel Rate";
+        case V4L2_CID_TEST_PATTERN:             return "Test Pattern";
 
         /* DV controls */
         case V4L2_CID_DV_CLASS:                 return "Digital Video Controls";
@@ -862,6 +863,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_DV_TX_MODE:
         case V4L2_CID_DV_TX_RGB_RANGE:
         case V4L2_CID_DV_RX_RGB_RANGE:
+        case V4L2_CID_TEST_PATTERN:
                 *type = V4L2_CTRL_TYPE_MENU;
                 break;
         case V4L2_CID_LINK_FREQ:
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index 421d24c7f686..e1b36809c21b 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -757,5 +757,6 @@ enum v4l2_jpeg_chroma_subsampling {
 
 #define V4L2_CID_LINK_FREQ                      (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
 #define V4L2_CID_PIXEL_RATE                     (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
+#define V4L2_CID_TEST_PATTERN                   (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3)
 
 #endif