CHROMIUM: v4l2/exynos: move CID enums into videodev2.h

<UPSTREAM MERGE NOT REQUIRED>

Move some #defines for V4L_CID_* values out of gsc-core.h and into
videodev2.h, where they belong, as they are part of the userspace API.

Signed-off-by: John Sheu <sheu@google.com>
BUG=chromium-os:37294
BUG=chrome-os-partner:10057
TEST=local build, run on snow

Change-Id: Ib06cd97f8c294a0d5f42f0b2adfefe4d761b256f
Reviewed-on: https://gerrit.chromium.org/gerrit/40499
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Tested-by: John Sheu <sheu@chromium.org>
Commit-Queue: John Sheu <sheu@chromium.org>

diff --git a/drivers/media/video/exynos/gsc/gsc-core.h b/drivers/media/video/exynos/gsc/gsc-core.h
index 91832a81027019ff74cf1cb4eb98152cb1aeec05..4e72e6e02143fb161e45293578c9d5902aa7c606 100644 (file)
--- a/drivers/media/video/exynos/gsc/gsc-core.h
+++ b/drivers/media/video/exynos/gsc/gsc-core.h
@@ -95,18 +95,6 @@ extern int gsc_dbg;
 #define        GSC_CTX_CAP                     (1 << 10)
 #define MAX_MDEV                       2
 
-#define V4L2_CID_CACHEABLE                     (V4L2_CID_LASTP1 + 1)
-#define V4L2_CID_TV_LAYER_BLEND_ENABLE         (V4L2_CID_LASTP1 + 2)
-#define V4L2_CID_TV_LAYER_BLEND_ALPHA          (V4L2_CID_LASTP1 + 3)
-#define V4L2_CID_TV_PIXEL_BLEND_ENABLE         (V4L2_CID_LASTP1 + 4)
-#define V4L2_CID_TV_CHROMA_ENABLE              (V4L2_CID_LASTP1 + 5)
-#define V4L2_CID_TV_CHROMA_VALUE               (V4L2_CID_LASTP1 + 6)
-/* for color space conversion equation selection */
-#define V4L2_CID_CSC_EQ_MODE                   (V4L2_CID_LASTP1 + 8)
-#define V4L2_CID_CSC_EQ                                (V4L2_CID_LASTP1 + 9)
-#define V4L2_CID_CSC_RANGE                     (V4L2_CID_LASTP1 + 10)
-#define V4L2_CID_GLOBAL_ALPHA                  (V4L2_CID_LASTP1 + 11)
-
 enum gsc_dev_flags {
        /* for global */
        ST_PWR_ON,

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 09f7f6df495fe5ce957baef0e294957d943f8af9..405313fbcbdb5c5132f5259981356aee074710ea 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1342,7 +1342,18 @@ enum v4l2_colorfx {
 /* last CID + 1 */
 #define V4L2_CID_LASTP1                         (V4L2_CID_BASE+42)
 
-#define V4L2_CID_CODEC_DISPLAY_STATUS           (V4L2_CID_BASE + 54)
+#define V4L2_CID_CACHEABLE                      (V4L2_CID_LASTP1 + 1)
+#define V4L2_CID_TV_LAYER_BLEND_ENABLE          (V4L2_CID_LASTP1 + 2)
+#define V4L2_CID_TV_LAYER_BLEND_ALPHA           (V4L2_CID_LASTP1 + 3)
+#define V4L2_CID_TV_PIXEL_BLEND_ENABLE          (V4L2_CID_LASTP1 + 4)
+#define V4L2_CID_TV_CHROMA_ENABLE               (V4L2_CID_LASTP1 + 5)
+#define V4L2_CID_TV_CHROMA_VALUE                (V4L2_CID_LASTP1 + 6)
+/* for color space conversion equation selection */
+#define V4L2_CID_CSC_EQ_MODE                    (V4L2_CID_LASTP1 + 8)
+#define V4L2_CID_CSC_EQ                         (V4L2_CID_LASTP1 + 9)
+#define V4L2_CID_CSC_RANGE                      (V4L2_CID_LASTP1 + 10)
+#define V4L2_CID_GLOBAL_ALPHA                   (V4L2_CID_LASTP1 + 11)
+#define V4L2_CID_CODEC_DISPLAY_STATUS           (V4L2_CID_LASTP1 + 12)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)