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

Merge "msm: camera: csiphy: Update secure PHY HW version checks" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Camera Software Integration
2020-08-28 13:07:27 -07:00
committed by Gerrit - the friendly Code Review server
parent e475f14229 64cd69547a
commit 640f077f09
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
View File

@@ -24,7 +24,12 @@
#define LANE_MASK_2PH 0x1F
#define LANE_MASK_3PH 0x7
/* Size of CPAS_SEC_LANE_CP_CTRL register mask */
#define SEC_LANE_CP_REG_LEN 32
/*
* PHY index at which CPAS_SEC_LANE_CP_CTRL register mask
* changes depending on PHY HW version
*/
#define MAX_PHY_MSK_PER_REG 4
/* Mask to enable skew calibration registers */
@@ -111,19 +116,24 @@ static int32_t cam_csiphy_update_secure_info(
lane_assign >>= 4;
}
if ((csiphy_dev->hw_version == CSIPHY_VERSION_V201) ||
(csiphy_dev->hw_version == CSIPHY_VERSION_V125)) {
phy_mask_len = CAM_CSIPHY_MAX_DPHY_LANES +
CAM_CSIPHY_MAX_CPHY_LANES + 1;
} else if (csiphy_dev->hw_version == CSIPHY_VERSION_V121) {
switch (csiphy_dev->hw_version) {
case CSIPHY_VERSION_V201:
case CSIPHY_VERSION_V125:
phy_mask_len =
(csiphy_dev->soc_info.index < MAX_PHY_MSK_PER_REG) ?
(CAM_CSIPHY_MAX_DPHY_LANES + CAM_CSIPHY_MAX_CPHY_LANES)
: (CAM_CSIPHY_MAX_DPHY_LANES +
CAM_CSIPHY_MAX_CPHY_LANES + 1);
} else {
phy_mask_len = CAM_CSIPHY_MAX_DPHY_LANES +
CAM_CSIPHY_MAX_CPHY_LANES;
CAM_CSIPHY_MAX_DPHY_LANES + CAM_CSIPHY_MAX_CPHY_LANES + 1;
break;
case CSIPHY_VERSION_V121:
case CSIPHY_VERSION_V123:
case CSIPHY_VERSION_V124:
phy_mask_len =
(csiphy_dev->soc_info.index < MAX_PHY_MSK_PER_REG) ?
(CAM_CSIPHY_MAX_DPHY_LANES + CAM_CSIPHY_MAX_CPHY_LANES) :
(CAM_CSIPHY_MAX_DPHY_LANES + CAM_CSIPHY_MAX_CPHY_LANES + 1);
break;
default:
phy_mask_len =
CAM_CSIPHY_MAX_DPHY_LANES + CAM_CSIPHY_MAX_CPHY_LANES;
break;
}
if (csiphy_dev->soc_info.index < MAX_PHY_MSK_PER_REG) {