diff --git a/config/shimacamera.conf b/config/shimacamera.conf
index 3b32dc7c49b2..ddc74389ec1f 100644
--- a/config/shimacamera.conf
+++ b/config/shimacamera.conf
@@ -3,7 +3,7 @@
 
 ifeq ($(CONFIG_QGKI),y)
 export CONFIG_SPECTRA_CAMERA=m
-$(info "SPECTRA_CAMERA IS STATIC")
+$(info "SPECTRA_CAMERA IS MODULAR")
 else
 $(info "SPECTRA_CAMERA IS MODULAR")
 export CONFIG_SPECTRA_CAMERA=m
diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
index 233a9392a6e1..69c315d5f18e 100644
--- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
+++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
@@ -484,6 +484,9 @@ static void cam_ife_hw_mgr_deinit_hw(
 		return;
 	}
 
+	if (ctx->is_tpg)
+		cam_ife_hw_mgr_deinit_hw_res(&ctx->res_list_tpg);
+
 	/* Deinit IFE CID */
 	list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_cid, list) {
 		CAM_DBG(CAM_ISP, "%s: Going to DeInit IFE CID\n", __func__);
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 9f0779c0ee99..e91cdb437a1e 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
@@ -1884,7 +1884,8 @@ static int cam_ife_csid_init_config_pxl_path(
 		 */
 		if (!(csid_hw->csid_debug & CSID_DEBUG_DISABLE_EARLY_EOF) &&
 			(camera_hw_version != CAM_CPAS_TITAN_480_V100) &&
-			(camera_hw_version != CAM_CPAS_TITAN_580_V100)) {
+			(camera_hw_version != CAM_CPAS_TITAN_580_V100) &&
+			(camera_hw_version != CAM_CPAS_TITAN_570_V200)) {
 			val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 				pxl_reg->csid_pxl_cfg0_addr);
 			val |= (1 << pxl_reg->early_eof_en_shift_val);