hardware: samsung_slsi: V4L2 CID update.

For Equal to the kernel CID.

Change-Id: I6cfb837f155a2f0f586deec70b83bef13d44f009
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

diff --git a/include/videodev2_exynos_media.h b/include/videodev2_exynos_media.h
index a452aaff6cda0ea373ef464b13ed223a96b368d3..0e133650a61190d11ad9466621572acb6c6a76d2 100644 (file)
--- a/include/videodev2_exynos_media.h
+++ b/include/videodev2_exynos_media.h
@@ -12,8 +12,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __LINUX_VIDEODEV2_EXYNOS_H
-#define __LINUX_VIDEODEV2_EXYNOS_H
+#ifndef __LINUX_VIDEODEV2_EXYNOS_MEDIA_H
+#define __LINUX_VIDEODEV2_EXYNOS_MEDIA_H
 
 /*      Pixel format          FOURCC                     depth  Description  */
 
@@ -77,20 +77,13 @@
 #define V4L2_CID_TV_CHROMA_ENABLE      (V4L2_CID_EXYNOS_BASE + 53)
 #define V4L2_CID_TV_CHROMA_VALUE       (V4L2_CID_EXYNOS_BASE + 54)
 #define V4L2_CID_TV_HPD_STATUS         (V4L2_CID_EXYNOS_BASE + 55)
-#define V4L2_CID_TV_LAYER_PRIO         (V4L2_CID_EXYNOS_BASE + 56)
+#define V4L2_CID_TV_SET_DVI_MODE       (V4L2_CID_EXYNOS_BASE + 57)
 
 /* for color space conversion equation selection */
 #define V4L2_CID_CSC_EQ_MODE           (V4L2_CID_EXYNOS_BASE + 100)
 #define V4L2_CID_CSC_EQ                        (V4L2_CID_EXYNOS_BASE + 101)
 #define V4L2_CID_CSC_RANGE             (V4L2_CID_EXYNOS_BASE + 102)
 
-/* for DRM playback scenario */
-#define V4L2_CID_USE_SYSMMU            (V4L2_CID_EXYNOS_BASE + 200)
-#define V4L2_CID_USE_PHYS              (V4L2_CID_EXYNOS_BASE + 201)
-#define V4L2_CID_PHYS_Y                        (V4L2_CID_EXYNOS_BASE + 202)
-#define V4L2_CID_PHYS_CB               (V4L2_CID_EXYNOS_BASE + 203)
-#define V4L2_CID_PHYS_CR               (V4L2_CID_EXYNOS_BASE + 204)
-
 /* CID base for MFC controls (MPEG_CLASS) */
 #define V4L2_CID_MPEG_MFC_BASE         (V4L2_CTRL_CLASS_MPEG | 0x2000)
 
@@ -163,6 +156,9 @@ enum v4l2_mpeg_mfc51_video_frame_type {
                                V4L2_CID_MPEG_MFC51_VIDEO_H264_RC_FRAME_RATE
 #define V4L2_CID_MPEG_MFC51_VIDEO_BIT_RATE_CH  V4L2_CID_MPEG_VIDEO_BITRATE
 
+/* new entry for enum v4l2_mpeg_video_mpeg4_level */
+#define V4L2_MPEG_VIDEO_MPEG4_LEVEL_6          8
+
 /* proposed CIDs, based on 3.3-rc3 */
 #define V4L2_CID_MPEG_VIDEO_VBV_DELAY          (V4L2_CID_MPEG_MFC_BASE + 26)
 
@@ -183,8 +179,10 @@ enum v4l2_mpeg_video_h264_sei_fp_arrangement_type {
        V4L2_MPEG_VIDEO_H264_SEI_FP_TYPE_TOP_BOTTOM     = 4,
        V4L2_MPEG_VIDEO_H264_SEI_FP_TYPE_TEMPORAL       = 5,
 };
-#define V4L2_CID_MPEG_VIDEO_H264_FMO           (V4L2_CID_MPEG_MFC_BASE + 30)
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE  (V4L2_CID_MPEG_MFC_BASE + 31)
+#define V4L2_CID_MPEG_VIDEO_H264_FMO                   \
+                                       (V4L2_CID_MPEG_MFC_BASE + 30)
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE          \
+                                       (V4L2_CID_MPEG_MFC_BASE + 31)
 enum v4l2_mpeg_video_h264_fmo_map_type {
        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES            = 0,
        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES              = 1,
@@ -222,6 +220,7 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {
                                        (V4L2_CID_MPEG_MFC_BASE + 40)
 #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP  \
                                        (V4L2_CID_MPEG_MFC_BASE + 41)
-#define V4L2_CID_MPEG_VIDEO_H264_MVC_VIEW_ID           \
+
+#define V4L2_CID_MPEG_VIDEO_H264_MVC_VIEW_ID                   \
                                        (V4L2_CID_MPEG_MFC_BASE + 42)
-#endif /* __LINUX_VIDEODEV2_EXYNOS_H */
+#endif /* __LINUX_VIDEODEV2_EXYNOS_MEDIA_H */