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

Commit 9d92c168 authored by Shilpa Mamidi's avatar Shilpa Mamidi Committed by Gerrit - the friendly Code Review server
Browse files

msm: cpp: Set GDRC register set after FW load 



As per hardware specifications register read
cannot be done upon setting GDRC register
with HW_CONTROL. This change will set
GDRC register with HW_CONTROL after
firmware load to ensure that HW version
returns correct value

CRs-Fixed: 950485
Change-Id: Ia08a14f9f05cd410140cf01c26b41d3afba94513
Signed-off-by: default avatarShilpa Mamidi <shilpam@codeaurora.org>
parent 566d1d5d

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+4 −6
Original line number Diff line number Diff line
@@ -1129,12 +1129,6 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
		}

	}



	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0) {

		pr_err("update cpp gdscr status failed\n");

		goto req_irq_fail;

	}



	cpp_dev->hw_info.cpp_hw_version =

		msm_camera_io_r(cpp_dev->cpp_hw_base);

	if (cpp_dev->hw_info.cpp_hw_version == CPP_HW_VERSION_4_1_0) {
@@ -1376,6 +1370,10 @@ static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin) 
			MSM_CPP_MSG_ID_JUMP_ACK, rc);

	}



	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0)

		pr_err("update cpp gdscr status failed\n");



end:

	return rc;

}