From 0b7f4c898450048aa06d5811cfb826ec583ec828 Mon Sep 17 00:00:00 2001 From: Wyes Karny Date: Wed, 3 Mar 2021 21:22:26 +0530 Subject: [PATCH] msm: camera: isp: Fix for wrong CPAS version selection in WM start Add fix for wrong CPAS version selection in WM start. CRs-Fixed: 2889723 Change-Id: Ic11f4ced601f3bb5f0f557714a1d2bd1f2143b78 Signed-off-by: Wyes Karny --- .../isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c index 39900b79e3..4c5454e7eb 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #include @@ -1273,7 +1273,8 @@ static int cam_vfe_bus_start_wm( return rc; } if ((camera_hw_version > CAM_CPAS_TITAN_NONE) && - (camera_hw_version < CAM_CPAS_TITAN_175_V100)) { + (camera_hw_version < CAM_CPAS_TITAN_175_V100) && + (camera_hw_version != CAM_CPAS_TITAN_165_V100)) { struct cam_vfe_bus_ver2_reg_offset_ubwc_client *ubwc_regs;