diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-21 05:00:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-21 05:00:24 -0700 |
| commit | d839862f49f973bbdc37bcced4bb070a4efd8b15 (patch) | |
| tree | 2e8cf192e86c778734e3b61dd9aa7e4af8e2c4f4 | |
| parent | 6d1f13e7ddbb3abd88e54af3a306abca9892b698 (diff) | |
| parent | b39002b8cc7973dbce025ecaea7b88253ad7e019 (diff) | |
Merge "msm: camera: isp: use NOMINAL clock for CX iPeak"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp47.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c index b704e84cc140..b351e0e765a9 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c @@ -2576,10 +2576,10 @@ int msm_vfe47_set_clk_rate(struct vfe_device *vfe_dev, long *rate) */ if ((vfe_dev->vfe_cx_ipeak) && (vfe_dev->msm_isp_vfe_clk_rate >= - vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] + vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL] [vfe_dev->hw_info->vfe_clk_idx]) && prev_clk_rate < - vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] + vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL] [vfe_dev->hw_info->vfe_clk_idx]) { ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, true); if (ret) { @@ -2599,10 +2599,10 @@ int msm_vfe47_set_clk_rate(struct vfe_device *vfe_dev, long *rate) */ if ((vfe_dev->vfe_cx_ipeak) && (vfe_dev->msm_isp_vfe_clk_rate < - vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] + vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL] [vfe_dev->hw_info->vfe_clk_idx]) && prev_clk_rate >= - vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] + vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL] [vfe_dev->hw_info->vfe_clk_idx]) { ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, false); if (ret) { |