From 00b8521d2a7de5aa11c148b74fb749580b41260f Mon Sep 17 00:00:00 2001 From: Depeng Shao Date: Tue, 4 Aug 2020 22:57:30 +0800 Subject: [PATCH] msm: camera: isp: Reset CSID sw register before reset clock domain Reset CSID SW register firstly to cut off potential input source before reset the HW logic, then HW logic won't get junk data. CRs-Fixed: 2731158 Change-Id: I9c8e1f3776229bf96c0c712de8c083b1334702ef Signed-off-by: Depeng Shao --- .../isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c index e91cdb437a1e..dd85eb45d4ab 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c @@ -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;