Merge "msm: camera: common: Enable additional IFE hw" into camera-kernel.lnx.4.0

This commit is contained in:
Jeyaprakash Soundrapandian 2019-12-23 21:27:38 -08:00 • committed by Gerrit - the friendly Code Review server
commit f7cf3781c0
2 changed files with 22 additions and 3 deletions

View file

@ -1438,6 +1438,22 @@ static int cam_convert_hw_idx_to_ife_hw_num(int hw_idx)
return CAM_ISP_IFE1_LITE_HW;
else if (hw_idx == 4)
return CAM_ISP_IFE2_LITE_HW;
else if (hw_idx == 5)
return CAM_ISP_IFE3_LITE_HW;
else if (hw_idx == 6)
return CAM_ISP_IFE4_LITE_HW;
break;
case CAM_CPAS_TITAN_580_V100:
if (hw_idx == 0)
return CAM_ISP_IFE0_HW;
else if (hw_idx == 1)
return CAM_ISP_IFE1_HW;
else if (hw_idx == 2)
return CAM_ISP_IFE2_HW;
else if (hw_idx == 3)
return CAM_ISP_IFE0_LITE_HW;
else if (hw_idx == 4)
return CAM_ISP_IFE1_LITE_HW;
break;
default:
CAM_ERR(CAM_ISP, "Invalid hw_version: 0x%X",

View file

@ -108,9 +108,12 @@
#define CAM_ISP_IFE0_HW 0x1
#define CAM_ISP_IFE1_HW 0x2
#define CAM_ISP_IFE0_LITE_HW 0x4
#define CAM_ISP_IFE1_LITE_HW 0x8
#define CAM_ISP_IFE2_LITE_HW 0x10
#define CAM_ISP_IFE2_HW 0x4
#define CAM_ISP_IFE0_LITE_HW 0x100
#define CAM_ISP_IFE1_LITE_HW 0x200
#define CAM_ISP_IFE2_LITE_HW 0x400
#define CAM_ISP_IFE3_LITE_HW 0x800
#define CAM_ISP_IFE4_LITE_HW 0x1000
#define CAM_ISP_PXL_PATH 0x1
#define CAM_ISP_PPP_PATH 0x2