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

Commit 089231c6 authored by Gaurav Jindal's avatar Gaurav Jindal Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: lrme: Remove Workaround for Lagoon BU 



During Lagoon bring up, lrme clock has some issue causing the probe
failure. To unblock, based on cpas version lrme hw start during
probe time was skipped.
Now the issue is fixed in clock driver, so remove the workaround.

CRs-Fixed: 2704460
Change-Id: Ifef1485fd54a51dd67e3adedb50267c71dfbb0d8
Signed-off-by: default avatarGaurav Jindal <gjindal@codeaurora.org>
parent 2612e6d4

drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_dev.c

+7 −19
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ static int cam_lrme_hw_dev_probe(struct platform_device *pdev) 
	const struct of_device_id *match_dev = NULL;

	struct cam_lrme_hw_info *hw_info;

	int rc, i;

	int32_t camera_hw_version;





	lrme_hw = kzalloc(sizeof(struct cam_hw_info), GFP_KERNEL);

	if (!lrme_hw) {
@@ -160,19 +158,11 @@ static int cam_lrme_hw_dev_probe(struct platform_device *pdev) 
		goto release_cdm;

	}



	rc = cam_cpas_get_cpas_hw_version(&camera_hw_version);

	if (rc) {

		CAM_ERR(CAM_ISP, "Failed to get HW version rc:%d", rc);

		goto release_cdm;

	}



	if (camera_hw_version != CAM_CPAS_TITAN_170_V200) {

	rc = cam_lrme_hw_start(lrme_hw, NULL, 0);

	if (rc) {

		CAM_ERR(CAM_LRME, "Failed to hw init, rc=%d", rc);

		goto detach_smmu;

	}

	}



	rc = cam_lrme_hw_util_get_caps(lrme_hw, &lrme_core->hw_caps);

	if (rc) {
@@ -182,13 +172,11 @@ static int cam_lrme_hw_dev_probe(struct platform_device *pdev) 
		goto detach_smmu;

	}



	if (camera_hw_version != CAM_CPAS_TITAN_170_V200) {

	rc = cam_lrme_hw_stop(lrme_hw, NULL, 0);

	if (rc) {

		CAM_ERR(CAM_LRME, "Failed to deinit hw, rc=%d", rc);

		goto detach_smmu;

	}

	}



	lrme_core->hw_idx = lrme_hw->soc_info.index;

	lrme_hw_intf.hw_priv = lrme_hw;