Merge "msm: camera: isp: Reset CSID sw register before reset clock domain" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-08-10 14:07:02 -07:00 • committed by Gerrit - the friendly Code Review server
commit 147f76cdb2

View file

@ -523,11 +523,11 @@ static int cam_ife_csid_global_reset(struct cam_ife_csid_hw *csid_hw)
cam_io_w_mb(0x2, soc_info->reg_map[0].mem_base +
csid_reg->rdi_reg[i]->csid_rdi_cfg0_addr);
/* reset HW regs first, then SW */
rc = cam_ife_csid_reset_regs(csid_hw, true);
/* reset SW regs first, then HW */
rc = cam_ife_csid_reset_regs(csid_hw, false);
if (rc < 0)
goto end;
rc = cam_ife_csid_reset_regs(csid_hw, false);
rc = cam_ife_csid_reset_regs(csid_hw, true);
if (rc < 0)
goto end;