samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: csiphy: Fix the version check for CP mask

Browse Source 
To configure CP mask correct version check needs to be
used against CPAS hw version. Currently csiphy driver
is checking platform version to make the decision.
This change update this check with CPAS hw version check.

CRs-Fixed: 3048249
Change-Id: Id023f5cc0252b47c274dfed9d93e7f49a3d0ab49
Signed-off-by: Jigarkumar Zala <quic_jzala@quicinc.com>
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
This commit is contained in:
Jigar Agrawal
2021-10-11 13:49:59 -07:00
committed by Camera Software Integration
parent df174ddd8a
commit e88df2b339
3 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cam_utils/cam_compat.c
View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
* copyright (c) 2022, Qulacomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/dma-mapping.h>
@@ -82,8 +83,7 @@ int cam_csiphy_notify_secure_mode(struct csiphy_device *csiphy_dev,
CAM_ERR(CAM_CSIPHY, "Invalid CSIPHY offset");
rc = -EINVAL;
} else if (qcom_scm_camera_protect_phy_lanes(protect,
csiphy_dev->csiphy_info[offset]
.csiphy_cpas_cp_reg_mask)) {
csiphy_dev->csiphy_info[offset].csiphy_cpas_cp_reg_mask)) {
CAM_ERR(CAM_CSIPHY, "SCM call to hypervisor failed");
rc = -EINVAL;
}