From f8efdf02724804c3d8aa86c5482c6b39d9086648 Mon Sep 17 00:00:00 2001 From: Jaehyoung Choi Date: Mon, 30 Jul 2018 14:45:32 +0900 Subject: [PATCH] Revert "[9610] dtsi: Change are DVFS levels match to scenarios" This reverts commit 7770d276142164e6f7677edb9b4e20f6b8a95c55. Change-Id: Ib8899b13c0c4353f574bd4208d16f527a7fcdc95 --- .../dts/exynos/exynos9610-erd9610-camera.dtsi | 254 ++++++------------ 1 file changed, 82 insertions(+), 172 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9610-erd9610-camera.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-erd9610-camera.dtsi index 15ee0275fda0..624832bea9a9 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-erd9610-camera.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-erd9610-camera.dtsi @@ -176,33 +176,33 @@ default_int = ; default_hpg = <1>; - front_preview_int_cam = ; - front_preview_cam = ; - front_preview_mif = ; + front_preview_int_cam = ; + front_preview_cam = ; + front_preview_mif = ; front_preview_int = ; front_preview_hpg = <1>; - front_preview_full_int_cam = ; - front_preview_full_cam = ; - front_preview_full_mif = ; + front_preview_full_int_cam = ; + front_preview_full_cam = ; + front_preview_full_mif = ; front_preview_full_int = ; front_preview_full_hpg = <1>; - front_capture_int_cam = ; - front_capture_cam = ; - front_capture_mif = ; + front_capture_int_cam = ; + front_capture_cam = ; + front_capture_mif = ; front_capture_int = ; front_capture_hpg = <1>; - front_video_int_cam = ; - front_video_cam = ; - front_video_mif = ; + front_video_int_cam = ; + front_video_cam = ; + front_video_mif = ; front_video_int = ; front_video_hpg = <1>; - front_video_capture_int_cam = ; - front_video_capture_cam = ; - front_video_capture_mif = ; + front_video_capture_int_cam = ; + front_video_capture_cam = ; + front_video_capture_mif = ; front_video_capture_int = ; front_video_capture_hpg = <1>; @@ -212,105 +212,81 @@ front_wide_selfie_int = ; front_wide_selfie_hpg = <1>; - front_vt1_int_cam = ; - front_vt1_cam = ; - front_vt1_mif = ; + front_vt1_int_cam = ; + front_vt1_cam = ; + front_vt1_mif = ; front_vt1_int = ; front_vt1_hpg = <1>; - front_vt2_int_cam = ; - front_vt2_cam = ; - front_vt2_mif = ; + front_vt2_int_cam = ; + front_vt2_cam = ; + front_vt2_mif = ; front_vt2_int = ; front_vt2_hpg = <1>; - front_vt4_int_cam = ; - front_vt4_cam = ; - front_vt4_mif = ; + front_vt4_int_cam = ; + front_vt4_cam = ; + front_vt4_mif = ; front_vt4_int = ; front_vt4_hpg = <1>; - rear2_preview_fhd_int_cam = ; - rear2_preview_fhd_cam = ; - rear2_preview_fhd_mif = ; - rear2_preview_fhd_int = ; - rear2_preview_fhd_hpg = <1>; - - rear2_capture_int_cam = ; - rear2_capture_cam = ; - rear2_capture_mif = ; - rear2_capture_int = ; - rear2_capture_hpg = <1>; - - rear2_video_fhd_int_cam = ; - rear2_video_fhd_cam = ; - rear2_video_fhd_mif = ; - rear2_video_fhd_int = ; - rear2_video_fhd_hpg = <1>; - - rear2_video_fhd_capture_int_cam = ; - rear2_video_fhd_capture_cam = ; - rear2_video_fhd_capture_mif = ; - rear2_video_fhd_capture_int = ; - rear2_video_fhd_capture_hpg = <1>; - - rear_preview_fhd_int_cam = ; - rear_preview_fhd_cam = ; - rear_preview_fhd_mif = ; + rear_preview_fhd_int_cam = ; + rear_preview_fhd_cam = ; + rear_preview_fhd_mif = ; rear_preview_fhd_int = ; rear_preview_fhd_hpg = <1>; - rear_preview_hd_int_cam = ; - rear_preview_hd_cam = ; - rear_preview_hd_mif = ; + rear_preview_hd_int_cam = ; + rear_preview_hd_cam = ; + rear_preview_hd_mif = ; rear_preview_hd_int = ; rear_preview_hd_hpg = <1>; - rear_preview_uhd_int_cam = ; - rear_preview_uhd_cam = ; - rear_preview_uhd_mif = ; + rear_preview_uhd_int_cam = ; + rear_preview_uhd_cam = ; + rear_preview_uhd_mif = ; rear_preview_uhd_int = ; rear_preview_uhd_hpg = <1>; - rear_preview_full_int_cam = ; - rear_preview_full_cam = ; - rear_preview_full_mif = ; + rear_preview_full_int_cam = ; + rear_preview_full_cam = ; + rear_preview_full_mif = ; rear_preview_full_int = ; rear_preview_full_hpg = <1>; - rear_capture_int_cam = ; - rear_capture_cam = ; - rear_capture_mif = ; + rear_capture_int_cam = ; + rear_capture_cam = ; + rear_capture_mif = ; rear_capture_int = ; rear_capture_hpg = <1>; - rear_video_fhd_int_cam = ; - rear_video_fhd_cam = ; - rear_video_fhd_mif = ; + rear_video_fhd_int_cam = ; + rear_video_fhd_cam = ; + rear_video_fhd_mif = ; rear_video_fhd_int = ; rear_video_fhd_hpg = <1>; - rear_video_hd_int_cam = ; - rear_video_hd_cam = ; - rear_video_hd_mif = ; + rear_video_hd_int_cam = ; + rear_video_hd_cam = ; + rear_video_hd_mif = ; rear_video_hd_int = ; rear_video_hd_hpg = <1>; - rear_video_uhd_int_cam = ; - rear_video_uhd_cam = ; - rear_video_uhd_mif = ; + rear_video_uhd_int_cam = ; + rear_video_uhd_cam = ; + rear_video_uhd_mif = ; rear_video_uhd_int = ; rear_video_uhd_hpg = <1>; - rear_video_fhd_capture_int_cam = ; - rear_video_fhd_capture_cam = ; - rear_video_fhd_capture_mif = ; + rear_video_fhd_capture_int_cam = ; + rear_video_fhd_capture_cam = ; + rear_video_fhd_capture_mif = ; rear_video_fhd_capture_int = ; rear_video_fhd_capture_hpg = <1>; - rear_video_hd_capture_int_cam = ; - rear_video_hd_capture_cam = ; - rear_video_hd_capture_mif = ; + rear_video_hd_capture_int_cam = ; + rear_video_hd_capture_cam = ; + rear_video_hd_capture_mif = ; rear_video_hd_capture_int = ; rear_video_hd_capture_hpg = <1>; @@ -320,117 +296,51 @@ rear_video_uhd_capture_int = ; rear_video_uhd_capture_hpg = <1>; - dual_preview_int_cam = ; - dual_preview_cam = ; - dual_preview_mif = ; - dual_preview_int = ; - dual_preview_hpg = <1>; - - dual_capture_int_cam = ; - dual_capture_cam = ; - dual_capture_mif = ; - dual_capture_int = ; - dual_capture_hpg = <1>; - - dual_video_fhd_int_cam = ; - dual_video_fhd_cam = ; - dual_video_fhd_mif = ; - dual_video_fhd_int = ; - dual_video_fhd_hpg = <1>; - - dual_video_fhd_capture_int_cam = ; - dual_video_fhd_capture_cam = ; - dual_video_fhd_capture_mif = ; - dual_video_fhd_capture_int = ; - dual_video_fhd_capture_hpg = <1>; - - dual_video_uhd_int_cam = ; - dual_video_uhd_cam = ; - dual_video_uhd_mif = ; - dual_video_uhd_int = ; - dual_video_uhd_hpg = <1>; - - dual_video_uhd_capture_int_cam = ; - dual_video_uhd_capture_cam = ; - dual_video_uhd_capture_mif = ; - dual_video_uhd_capture_int = ; - dual_video_uhd_capture_hpg = <1>; - - dual_sync_preview_int_cam = ; - dual_sync_preview_cam = ; - dual_sync_preview_mif = ; - dual_sync_preview_int = ; - dual_sync_preview_hpg = <1>; - - dual_sync_capture_int_cam = ; - dual_sync_capture_cam = ; - dual_sync_capture_mif = ; - dual_sync_capture_int = ; - dual_sync_capture_hpg = <1>; - - dual_sync_preview_whd_int_cam = ; - dual_sync_preview_whd_cam = ; - dual_sync_preview_whd_mif = ; - dual_sync_preview_whd_int = ; - dual_sync_preview_whd_hpg = <1>; - - dual_sync_whd_capture_int_cam = ; - dual_sync_whd_capture_cam = ; - dual_sync_whd_capture_mif = ; - dual_sync_whd_capture_int = ; - dual_sync_whd_capture_hpg = <1>; - - dual_sync_video_fhd_int_cam = ; - dual_sync_video_fhd_cam = ; - dual_sync_video_fhd_mif = ; - dual_sync_video_fhd_int = ; - dual_sync_video_fhd_hpg = <1>; - - dual_sync_video_fhd_capture_int_cam = ; - dual_sync_video_fhd_capture_cam = ; - dual_sync_video_fhd_capture_mif = ; - dual_sync_video_fhd_capture_int = ; - dual_sync_video_fhd_capture_hpg = <1>; - - dual_sync_video_uhd_int_cam = ; - dual_sync_video_uhd_cam = ; - dual_sync_video_uhd_mif = ; - dual_sync_video_uhd_int = ; - dual_sync_video_uhd_hpg = <1>; - - dual_sync_video_uhd_capture_int_cam = ; - dual_sync_video_uhd_capture_cam = ; - dual_sync_video_uhd_capture_mif = ; - dual_sync_video_uhd_capture_int = ; - dual_sync_video_uhd_capture_hpg = <1>; - secure_front_int_cam = ; secure_front_cam = ; secure_front_mif = ; secure_front_int = ; secure_front_hpg = <1>; + pip_preview_int_cam = ; + pip_preview_cam = ; + pip_preview_mif = ; + pip_preview_int = ; + pip_preview_hpg = <1>; + + pip_capture_int_cam = ; + pip_capture_cam = ; + pip_capture_mif = ; + pip_capture_int = ; + pip_capture_hpg = <1>; + + pip_video_int_cam = ; + pip_video_cam = ; + pip_video_mif = ; + pip_video_int = ; + pip_video_hpg = <1>; + + pip_video_capture_int_cam = ; + pip_video_capture_cam = ; + pip_video_capture_mif = ; + pip_video_capture_int = ; + pip_video_capture_hpg = <1>; + preview_high_speed_fps_int_cam = ; preview_high_speed_fps_cam = ; preview_high_speed_fps_mif = ; preview_high_speed_fps_int = ; preview_high_speed_fps_hpg = <1>; - video_high_speed_60fps_int_cam = ; - video_high_speed_60fps_cam = ; - video_high_speed_60fps_mif = ; + video_high_speed_60fps_int_cam = ; + video_high_speed_60fps_cam = ; + video_high_speed_60fps_mif = ; video_high_speed_60fps_int = ; video_high_speed_60fps_hpg = <1>; - video_high_speed_120fps_int_cam = ; - video_high_speed_120fps_cam = ; - video_high_speed_120fps_mif = ; - video_high_speed_120fps_int = ; - video_high_speed_120fps_hpg = <1>; - video_high_speed_480fps_int_cam = ; video_high_speed_480fps_cam = ; - video_high_speed_480fps_mif = ; + video_high_speed_480fps_mif = ; video_high_speed_480fps_int = ; video_high_speed_480fps_hpg = <1>; -- 2.20.1