Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af3ec8d authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: common: Add support of PHY TPG deinitialization" into camera-kernel.lnx.4.0

parents 12fbb557 bfa65377

config/shimacamera.conf

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+3 −0
Original line number Diff line number Diff line
@@ -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__);

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -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);