Browse Source

msm: camera: isp: Add logic to support 3rd SFE in CSID

Add input core selection logic to support 3rd SFE in CSID.

CRs-Fixed: 3168727
Change-Id: If208a589848f0444e33511ac6831babf3256dab6
Signed-off-by: Chandan Kumar Jha <[email protected]>
Chandan Kumar Jha 3 năm trước cách đây
mục cha
commit
b06504ab4b

+ 1 - 1
drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h

@@ -16,7 +16,7 @@
 
 /* MAX IFE instance */
 #define CAM_IFE_HW_NUM_MAX       8
-#define CAM_SFE_HW_NUM_MAX       2
+#define CAM_SFE_HW_NUM_MAX       3
 #define CAM_IFE_RDI_NUM_MAX      4
 #define CAM_SFE_RDI_NUM_MAX      5
 #define CAM_SFE_FE_RDI_NUM_MAX   3

+ 3 - 0
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid880.h

@@ -1407,6 +1407,7 @@ static struct cam_ife_csid_ver2_reg_info cam_ife_csid_880_reg_info = {
 			0x1,
 			0x2,
 			0x3,
+			0x4,
 			0x8,
 			-1,
 			-1,
@@ -1416,6 +1417,7 @@ static struct cam_ife_csid_ver2_reg_info cam_ife_csid_880_reg_info = {
 			0x1,
 			0x2,
 			0x3,
+			0x4,
 			-1,
 			-1,
 			-1,
@@ -1425,6 +1427,7 @@ static struct cam_ife_csid_ver2_reg_info cam_ife_csid_880_reg_info = {
 			0x1,
 			0x2,
 			0x3,
+			0x4,
 			-1,
 			0x9,
 			-1,

+ 3 - 0
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -4639,6 +4639,9 @@ static int cam_ife_csid_ver2_top_cfg(
 		} else if (top_args->core_idx == 1) {
 			csid_hw->top_cfg.input_core_type =
 				CAM_IFE_CSID_INPUT_CORE_SEL_SFE_1;
+		} else if (top_args->core_idx == 2) {
+			csid_hw->top_cfg.input_core_type =
+				CAM_IFE_CSID_INPUT_CORE_SEL_SFE_2;
 		} else {
 			rc = -EINVAL;
 			CAM_ERR(CAM_ISP,

+ 1 - 0
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.h

@@ -81,6 +81,7 @@ enum cam_ife_csid_ver2_input_core_sel {
 	CAM_IFE_CSID_INPUT_CORE_SEL_INTERNAL,
 	CAM_IFE_CSID_INPUT_CORE_SEL_SFE_0,
 	CAM_IFE_CSID_INPUT_CORE_SEL_SFE_1,
+	CAM_IFE_CSID_INPUT_CORE_SEL_SFE_2,
 	CAM_IFE_CSID_INPUT_CORE_SEL_CUST_NODE_0,
 	CAM_IFE_CSID_INPUT_CORE_SEL_CUST_NODE_1,
 	CAM_IFE_CSID_INPUT_CORE_SEL_CUST_NODE_2,

+ 0 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_sfe_hw_intf.h

@@ -12,7 +12,6 @@
 #include "cam_cpas_api.h"
 
 #define SFE_CORE_BASE_IDX           0
-#define CAM_SFE_HW_NUM_MAX          2
 #define CAM_SFE_PERF_CNT_MAX        2
 
 enum cam_sfe_core_id {