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

Commit 7e3d9481 authored by Rajakumar Govindaram's avatar Rajakumar Govindaram Committed by Jeevan Shriram
Browse files

msm: camera: cpp: Support conditional reset of micro 



The micro clock needs to be conditionally reset based on
target. This can help to avoid probe failures on targets
where it is not supported.

CRs-Fixed: 1017151
Change-Id: Idd7e7255ebc8a08f418289fa172c37f72a21ced0
Signed-off-by: default avatarRajakumar Govindaram <rajakuma@codeaurora.org>
parent 151f9427

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

+6 −4
Original line number Diff line number Diff line
@@ -780,11 +780,13 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
		goto reg_enable_failed;

	}



	if (cpp_dev->micro_reset) {

		rc = msm_cpp_set_micro_clk(cpp_dev);

		if (rc < 0) {

		pr_err("%s: set micro clk failed\n", __func__);

			pr_err("%s: reset micro clk failed\n", __func__);

			goto clk_failed;

		}

	}



	rc = msm_camera_clk_enable(&cpp_dev->pdev->dev, cpp_dev->clk_info,

			cpp_dev->cpp_clk, cpp_dev->num_clks, true);

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

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct cpp_device { 
	uint32_t bus_client;

	uint32_t bus_idx;

	uint32_t bus_master_flag;

	uint32_t micro_reset;

	struct msm_cpp_payload_params payload_params;

};