Merge "msm: camera: ife: Remove epd reset operation from csid global reset" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-09-25 16:53:12 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6f7f5948e9

View file

@ -538,7 +538,6 @@ static int cam_ife_csid_global_reset(struct cam_ife_csid_hw *csid_hw)
csid_hw->hw_intf->hw_idx, val);
csid_hw->error_irq_count = 0;
csid_hw->prev_boot_timestamp = 0;
csid_hw->epd_supported = 0;
end:
return rc;
@ -5315,6 +5314,7 @@ int cam_ife_csid_hw_probe_init(struct cam_hw_intf *csid_hw_intf,
ife_csid_hw->error_irq_count = 0;
ife_csid_hw->ipp_path_config.measure_enabled = 0;
ife_csid_hw->ppp_path_config.measure_enabled = 0;
ife_csid_hw->epd_supported = 0;
for (i = 0; i <= CAM_IFE_PIX_PATH_RES_RDI_3; i++)
ife_csid_hw->rdi_path_config[i].measure_enabled = 0;