Procházet zdrojové kódy

msm: camera: isp: Fix IRQ masks for CSID

Add top IRQ status mask for IPP and change it to correct value for PPP.
Add epoch shift values for IPP. Fix private variable pointer passed for
PPP IRQ subscribe.

CRs-Fixed: 3090212
Change-Id: I3544d468f8ea69de6b814698b464503ce8fc9adf
Signed-off-by: Anand Ravi <[email protected]>
Anand Ravi před 3 roky
rodič
revize
f3e6b4172b

+ 4 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid780.h

@@ -467,6 +467,9 @@ static struct cam_ife_csid_ver2_path_reg_info
 		.non_fatal_err_mask               = 0x10000000,
 		.camif_irq_mask                   = 0x800000,
 		.rup_aup_mask                     = 0x10001,
+		.top_irq_mask                     = 0x10,
+		.epoch0_shift_val                 = 16,
+		.epoch1_shift_val                 = 0,
 };
 
 static struct cam_ife_csid_ver2_path_reg_info
@@ -565,7 +568,7 @@ static struct cam_ife_csid_ver2_path_reg_info
 		.fatal_err_mask                   = 0x186007,
 		.non_fatal_err_mask               = 0x10000000,
 		.rup_aup_mask                     = 0x40004,
-		.top_irq_mask                     = 0x10,
+		.top_irq_mask                     = 0x40,
 		.epoch0_shift_val                 = 16,
 		.epoch1_shift_val                 = 0,
 		.sof_retiming_dis_shift           = 5,

+ 2 - 2
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -3629,7 +3629,7 @@ static int cam_ife_csid_ver2_program_ppp_path(
 				csid_hw->csid_irq_controller,
 				CAM_IRQ_PRIORITY_1,
 				irq_mask,
-				csid_hw,
+				res,
 				cam_ife_csid_ver2_path_top_half,
 				cam_ife_csid_ver2_ppp_bottom_half,
 				csid_hw->tasklet,
@@ -3661,7 +3661,7 @@ static int cam_ife_csid_ver2_program_ppp_path(
 					irq_mask,
 					res,
 					cam_ife_csid_ver2_path_err_top_half,
-					cam_ife_csid_ver2_ipp_bottom_half,
+					cam_ife_csid_ver2_ppp_bottom_half,
 					csid_hw->tasklet,
 					&tasklet_bh_api,
 					CAM_IRQ_EVT_GROUP_0);