From 1f5f70bfab13dca6f8ed1bc8dab69ee0c8e8155e Mon Sep 17 00:00:00 2001 From: Jigarkumar Zala Date: Tue, 22 Sep 2020 13:48:15 -0700 Subject: [PATCH] msm: camera: ife: Remove epd reset operation from csid global reset EPD support is configured as a part of config blob. Currently global reset is invoked after CSID is configured and as a part of that epd support attributre gets reset. This cause CPHY_EOT_RECEPTION error from CSID. This change removes reset part of epd supported attribute to continue with the expected opertion set during configuration of CSID. Also, set this attribute to zero by default at probe time to make sure epd is not supported. CRs-Fixed: 2775508 Change-Id: I0f49f952d2156d92eb0fb1813951a325b63e60b0 Signed-off-by: Jigarkumar Zala --- .../cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a99d3f902e24..65490b4ac4a7 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 @@ -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; @@ -5241,6 +5240,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;