[9610] fimc-is2: Fix a SCAR error at DVFS file
authordan huh <dan.huh@samsung.com>
Thu, 16 Aug 2018 23:33:58 +0000 (08:33 +0900)
committerhskang <hs1218.kang@samsung.com>
Fri, 17 Aug 2018 01:27:11 +0000 (21:27 -0400)
PR JIRA ID: CPR-171

Change-Id: Id094c678808b63771d8d46d61a3269a4498f4f5c
Signed-off-by: dan huh <dan.huh@samsung.com>
drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-hw-dvfs.c

index adee966d893ada4f67927d7780ec992be92e316d..2381d97788bdde0c2753e7f1099c588b5a64f00e 100644 (file)
 
 /* for DT parsing */
 DECLARE_DVFS_DT(FIMC_IS_SN_END,
-               {"default_"                        , FIMC_IS_SN_DEFAULT},
-               {"secure_front_"                   , FIMC_IS_SN_SECURE_FRONT},
-               {"front_preview_"                  , FIMC_IS_SN_FRONT_PREVIEW},
-               {"front_preview_full_"             , FIMC_IS_SN_FRONT_PREVIEW_FULL},
-               {"front_capture_"                  , FIMC_IS_SN_FRONT_CAPTURE},
-               {"front_video_"                    , FIMC_IS_SN_FRONT_CAMCORDING},
-               {"front_video_capture_"            , FIMC_IS_SN_FRONT_CAMCORDING_CAPTURE},
-               {"front_wide_selfie_"      , FIMC_IS_SN_FRONT_WIDE_SELFIE},
-               {"front_vt1_"                      , FIMC_IS_SN_FRONT_VT1},
-               {"front_vt2_"                      , FIMC_IS_SN_FRONT_VT2},
-               {"front_vt4_"                      , FIMC_IS_SN_FRONT_VT4},
-               {"rear2_preview_fhd_"              , FIMC_IS_SN_REAR2_PREVIEW_FHD},
-               {"rear2_capture_"                  , FIMC_IS_SN_REAR2_CAPTURE},
-               {"rear2_video_fhd_"                , FIMC_IS_SN_REAR2_CAMCORDING_FHD},
-               {"rear2_video_fhd_capture_"        , FIMC_IS_SN_REAR2_CAMCORDING_FHD_CAPTURE},
-               {"rear_preview_full_"              , FIMC_IS_SN_REAR_PREVIEW_FULL},
-               {"rear_preview_fhd_"               , FIMC_IS_SN_REAR_PREVIEW_FHD},
-               {"rear_preview_hd_"                , FIMC_IS_SN_REAR_PREVIEW_HD},
-               {"rear_preview_uhd_"               , FIMC_IS_SN_REAR_PREVIEW_UHD},
-               {"rear_capture_"                   , FIMC_IS_SN_REAR_CAPTURE},
-               {"rear_video_fhd_"                 , FIMC_IS_SN_REAR_CAMCORDING_FHD},
-               {"rear_video_hd_"                                  , FIMC_IS_SN_REAR_CAMCORDING_HD},
-               {"rear_video_uhd_"                 , FIMC_IS_SN_REAR_CAMCORDING_UHD},
-               {"rear_video_fhd_capture_"         , FIMC_IS_SN_REAR_CAMCORDING_FHD_CAPTURE},
-               {"rear_video_hd_capture_"                  , FIMC_IS_SN_REAR_CAMCORDING_HD_CAPTURE},
-               {"rear_video_uhd_capture_"         , FIMC_IS_SN_REAR_CAMCORDING_UHD_CAPTURE},
-               {"dual_preview_"                        , FIMC_IS_SN_DUAL_PREVIEW},
-               {"dual_capture_"                        , FIMC_IS_SN_DUAL_CAPTURE},
-               {"dual_video_fhd_"                      , FIMC_IS_SN_DUAL_FHD_CAMCORDING},
-               {"dual_video_fhd_capture_"              , FIMC_IS_SN_DUAL_FHD_CAMCORDING_CAPTURE},
-               {"dual_video_uhd_"                      , FIMC_IS_SN_DUAL_UHD_CAMCORDING},
-               {"dual_video_uhd_capture_"              , FIMC_IS_SN_DUAL_UHD_CAMCORDING_CAPTURE},
-               {"dual_sync_preview_"                   , FIMC_IS_SN_DUAL_SYNC_PREVIEW},
-               {"dual_sync_capture_"                   , FIMC_IS_SN_DUAL_SYNC_CAPTURE},
-               {"dual_sync_preview_whd_"               , FIMC_IS_SN_DUAL_SYNC_PREVIEW_WHD},
-               {"dual_sync_whd_capture_"               , FIMC_IS_SN_DUAL_SYNC_WHD_CAPTURE},
-               {"dual_sync_video_fhd_"                 , FIMC_IS_SN_DUAL_SYNC_FHD_CAMCORDING},
-               {"dual_sync_video_fhd_capture_"         , FIMC_IS_SN_DUAL_SYNC_FHD_CAMCORDING_CAPTURE},
-               {"dual_sync_video_uhd_"                 , FIMC_IS_SN_DUAL_SYNC_UHD_CAMCORDING},
-               {"dual_sync_video_uhd_capture_"         , FIMC_IS_SN_DUAL_SYNC_UHD_CAMCORDING_CAPTURE},
-               {"pip_preview_"                    , FIMC_IS_SN_PIP_PREVIEW},
-               {"pip_capture_"                    , FIMC_IS_SN_PIP_CAPTURE},
-               {"preview_high_speed_fps_"         , FIMC_IS_SN_PREVIEW_HIGH_SPEED_FPS},
-               {"video_high_speed_60fps_"         , FIMC_IS_SN_VIDEO_HIGH_SPEED_60FPS},
-               {"video_high_speed_120fps_"        , FIMC_IS_SN_VIDEO_HIGH_SPEED_120FPS},
-               {"video_high_speed_480fps_"        , FIMC_IS_SN_VIDEO_HIGH_SPEED_480FPS},
-               {"video_high_speed_60fps_capture_" , FIMC_IS_SN_VIDEO_HIGH_SPEED_60FPS_CAPTURE},
-               {"ext_rear_"                 , FIMC_IS_SN_EXT_REAR},
-               {"ext_front_"                , FIMC_IS_SN_EXT_FRONT},
-               {"ext_secure_"                   , FIMC_IS_SN_EXT_SECURE},
-               {"max_"                            , FIMC_IS_SN_MAX});
+               {"default_",                            FIMC_IS_SN_DEFAULT},
+               {"secure_front_",                       FIMC_IS_SN_SECURE_FRONT},
+               {"front_preview_",                      FIMC_IS_SN_FRONT_PREVIEW},
+               {"front_preview_full_",                 FIMC_IS_SN_FRONT_PREVIEW_FULL},
+               {"front_capture_",                      FIMC_IS_SN_FRONT_CAPTURE},
+               {"front_video_",                        FIMC_IS_SN_FRONT_CAMCORDING},
+               {"front_video_capture_",                FIMC_IS_SN_FRONT_CAMCORDING_CAPTURE},
+               {"front_wide_selfie_",                  FIMC_IS_SN_FRONT_WIDE_SELFIE},
+               {"front_vt1_",                          FIMC_IS_SN_FRONT_VT1},
+               {"front_vt2_",                          FIMC_IS_SN_FRONT_VT2},
+               {"front_vt4_",                          FIMC_IS_SN_FRONT_VT4},
+               {"rear2_preview_fhd_",                  FIMC_IS_SN_REAR2_PREVIEW_FHD},
+               {"rear2_capture_",                      FIMC_IS_SN_REAR2_CAPTURE},
+               {"rear2_video_fhd_",                    FIMC_IS_SN_REAR2_CAMCORDING_FHD},
+               {"rear2_video_fhd_capture_",            FIMC_IS_SN_REAR2_CAMCORDING_FHD_CAPTURE},
+               {"rear_preview_full_",                  FIMC_IS_SN_REAR_PREVIEW_FULL},
+               {"rear_preview_fhd_",                   FIMC_IS_SN_REAR_PREVIEW_FHD},
+               {"rear_preview_hd_",                    FIMC_IS_SN_REAR_PREVIEW_HD},
+               {"rear_preview_uhd_",                   FIMC_IS_SN_REAR_PREVIEW_UHD},
+               {"rear_capture_",                       FIMC_IS_SN_REAR_CAPTURE},
+               {"rear_video_fhd_",                     FIMC_IS_SN_REAR_CAMCORDING_FHD},
+               {"rear_video_hd_",                      FIMC_IS_SN_REAR_CAMCORDING_HD},
+               {"rear_video_uhd_",                     FIMC_IS_SN_REAR_CAMCORDING_UHD},
+               {"rear_video_fhd_capture_",             FIMC_IS_SN_REAR_CAMCORDING_FHD_CAPTURE},
+               {"rear_video_hd_capture_",              FIMC_IS_SN_REAR_CAMCORDING_HD_CAPTURE},
+               {"rear_video_uhd_capture_",             FIMC_IS_SN_REAR_CAMCORDING_UHD_CAPTURE},
+               {"dual_preview_",                       FIMC_IS_SN_DUAL_PREVIEW},
+               {"dual_capture_",                       FIMC_IS_SN_DUAL_CAPTURE},
+               {"dual_video_fhd_",                     FIMC_IS_SN_DUAL_FHD_CAMCORDING},
+               {"dual_video_fhd_capture_",             FIMC_IS_SN_DUAL_FHD_CAMCORDING_CAPTURE},
+               {"dual_video_uhd_",                     FIMC_IS_SN_DUAL_UHD_CAMCORDING},
+               {"dual_video_uhd_capture_",             FIMC_IS_SN_DUAL_UHD_CAMCORDING_CAPTURE},
+               {"dual_sync_preview_",                  FIMC_IS_SN_DUAL_SYNC_PREVIEW},
+               {"dual_sync_capture_",                  FIMC_IS_SN_DUAL_SYNC_CAPTURE},
+               {"dual_sync_preview_whd_",              FIMC_IS_SN_DUAL_SYNC_PREVIEW_WHD},
+               {"dual_sync_whd_capture_",              FIMC_IS_SN_DUAL_SYNC_WHD_CAPTURE},
+               {"dual_sync_video_fhd_",                FIMC_IS_SN_DUAL_SYNC_FHD_CAMCORDING},
+               {"dual_sync_video_fhd_capture_",        FIMC_IS_SN_DUAL_SYNC_FHD_CAMCORDING_CAPTURE},
+               {"dual_sync_video_uhd_",                FIMC_IS_SN_DUAL_SYNC_UHD_CAMCORDING},
+               {"dual_sync_video_uhd_capture_",        FIMC_IS_SN_DUAL_SYNC_UHD_CAMCORDING_CAPTURE},
+               {"pip_preview_",                        FIMC_IS_SN_PIP_PREVIEW},
+               {"pip_capture_",                        FIMC_IS_SN_PIP_CAPTURE},
+               {"preview_high_speed_fps_",             FIMC_IS_SN_PREVIEW_HIGH_SPEED_FPS},
+               {"video_high_speed_60fps_",             FIMC_IS_SN_VIDEO_HIGH_SPEED_60FPS},
+               {"video_high_speed_120fps_",            FIMC_IS_SN_VIDEO_HIGH_SPEED_120FPS},
+               {"video_high_speed_480fps_",            FIMC_IS_SN_VIDEO_HIGH_SPEED_480FPS},
+               {"video_high_speed_60fps_capture_",     FIMC_IS_SN_VIDEO_HIGH_SPEED_60FPS_CAPTURE},
+               {"ext_rear_",                           FIMC_IS_SN_EXT_REAR},
+               {"ext_front_",                          FIMC_IS_SN_EXT_FRONT},
+               {"ext_secure_",                         FIMC_IS_SN_EXT_SECURE},
+               {"max_",                                FIMC_IS_SN_MAX});
 
 /* dvfs scenario check logic data */
 DECLARE_DVFS_CHK_FUNC(FIMC_IS_SN_SECURE_FRONT);