A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: csid: Rename TPG vd/dt macros" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Haritha Chintalapati 2020-03-03 14:21:05 -08:00 • committed by Gerrit - the friendly Code Review server
commit 0f65d30e1d
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View file

@ -26,8 +26,8 @@
#define CAM_IFE_CSID_TPG_DT_VAL 0x2B
/* CSIPHY TPG VC/DT values */
#define CAM_IFE_CSI_TPG_VC_VAL 0x0
#define CAM_IFE_CSI_TPG_DT_VAL 0x2B
#define CAM_IFE_CPHY_TPG_VC_VAL 0x0
#define CAM_IFE_CPHY_TPG_DT_VAL 0x2B
/* Timeout values in usec */
#define CAM_IFE_CSID_TIMEOUT_SLEEP_US 1000
@ -1142,10 +1142,12 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
path_data->crop_enable);
if ((reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_0) ||
(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_1) ||
(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_TPG)) {
path_data->dt = CAM_IFE_CSI_TPG_DT_VAL;
path_data->vc = CAM_IFE_CSI_TPG_VC_VAL;
(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_1)) {
path_data->dt = CAM_IFE_CPHY_TPG_DT_VAL;
path_data->vc = CAM_IFE_CPHY_TPG_VC_VAL;
} else if (reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_TPG) {
path_data->dt = CAM_IFE_CSID_TPG_DT_VAL;
path_data->vc = CAM_IFE_CSID_TPG_VC_VAL;
} else {
path_data->dt = reserve->in_port->dt[0];
path_data->vc = reserve->in_port->vc[0];