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

Commit 17c4d658 authored by Krishnankutty Kolathappilly's avatar Krishnankutty Kolathappilly
Browse files

msm: cpp: Use the src clock node to read the cpp src clock rate 



Use the src clock binding to read the cpp src clock rate intead of
using the list rate api from clock driver.

CRs-Fixed: 1079648
Change-Id: I2ebdc0c41c521e56a400d685b6254174cffdc14b
Signed-off-by: default avatarKrishnankutty Kolathappilly <kkolatha@codeaurora.org>
parent 9b67d14a

Documentation/devicetree/bindings/media/video/msm-cpp.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ Required properties: 
  and reset lines used by this controller.

- reset-names: reset signal name strings sorted in the same order as the resets

  property.

- qcom,src-clock-rates =  This is an array which holds clock rates for cpp src

  clocks. The maximum size for the array is 10.



Required properties of the child node:

- qcom,stripe-base = Base offset of stripes in cpp payload.
@@ -107,6 +109,8 @@ Example: 
			<0x24 0x10000000>,

			<0x28 0x10000000>,

			<0x2C 0x10000000>;

		qcom,src-clock-rates = <100000000 200000000 384000000 404000000

			480000000 576000000 600000000>;

		qcom,cpp-fw-payload-info {

			qcom,stripe-base = <553>;

			qcom,plane-base = <481>;

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

+53 −21
Original line number Diff line number Diff line
@@ -66,39 +66,72 @@ int msm_cpp_get_clock_index(struct cpp_device *cpp_dev, const char *clk_name) 
	return -EINVAL;

}



static int cpp_get_clk_freq_tbl(struct clk *clk, struct cpp_hw_info *hw_info,

	uint32_t min_clk_rate)

static int cpp_get_clk_freq_tbl_dt(struct cpp_device *cpp_dev)

{

	uint32_t i;

	uint32_t i, count, min_clk_rate;

	uint32_t idx = 0;

	signed long freq_tbl_entry = 0;

	struct device_node *of_node;

	uint32_t *rates;

	int32_t rc = 0;

	struct cpp_hw_info *hw_info;



	if ((clk == NULL) || (hw_info == NULL) || (clk->ops == NULL) ||

		(clk->ops->list_rate == NULL)) {

	if (cpp_dev == NULL) {

		pr_err("Bad parameter\n");

		return -EINVAL;

		rc = -EINVAL;

		goto err;

	}



	for (i = 0; i < MAX_FREQ_TBL; i++) {

		freq_tbl_entry = clk->ops->list_rate(clk, i);

		pr_debug("entry=%ld\n", freq_tbl_entry);

		if (freq_tbl_entry >= 0) {

			if (freq_tbl_entry >= min_clk_rate) {

				hw_info->freq_tbl[idx++] = freq_tbl_entry;

				pr_debug("tbl[%d]=%ld\n", idx-1,

					freq_tbl_entry);

	of_node = cpp_dev->pdev->dev.of_node;

	min_clk_rate = cpp_dev->min_clk_rate;

	hw_info = &cpp_dev->hw_info;



	if ((hw_info == NULL) || (of_node == NULL)) {

		pr_err("Invalid hw_info %p or ofnode %p\n", hw_info, of_node);

		rc = -EINVAL;

		goto err;



	}

	count = of_property_count_u32_elems(of_node, "qcom,src-clock-rates");

	if ((count == 0) || (count > MAX_FREQ_TBL)) {

		pr_err("Clock count is invalid\n");

		rc = -EINVAL;

		goto err;

	}



	rates = devm_kcalloc(&cpp_dev->pdev->dev, count, sizeof(uint32_t),

		GFP_KERNEL);

	if (!rates) {

		rc = -ENOMEM;

		goto err;

	}



	rc = of_property_read_u32_array(of_node, "qcom,src-clock-rates",

		rates, count);

	if (rc) {

		rc = -EINVAL;

		goto mem_free;

	}



	for (i = 0; i < count; i++) {

		pr_debug("entry=%d\n", rates[i]);

		if (rates[i] >= 0) {

			if (rates[i] >= min_clk_rate) {

				hw_info->freq_tbl[idx++] = rates[i];

				pr_debug("tbl[%d]=%d\n", idx-1, rates[i]);

			}

		} else {

			pr_debug("freq table returned invalid entry/end %ld\n",

				freq_tbl_entry);

			pr_debug("rate is invalid entry/end %d\n", rates[i]);

			break;

		}

	}



	pr_debug("%s: idx %d", __func__, idx);

	pr_debug("%s: idx %d\n", __func__, idx);

	hw_info->freq_tbl_count = idx;



	return 0;

mem_free:

	devm_kfree(&cpp_dev->pdev->dev, rates);

err:

	return rc;

}



int msm_cpp_set_micro_clk(struct cpp_device *cpp_dev)
@@ -147,8 +180,7 @@ int msm_update_freq_tbl(struct cpp_device *cpp_dev) 
		rc = msm_cpp_core_clk_idx;

		return rc;

	}

	rc = cpp_get_clk_freq_tbl(cpp_dev->cpp_clk[msm_cpp_core_clk_idx],

		&cpp_dev->hw_info, cpp_dev->min_clk_rate);

	rc = cpp_get_clk_freq_tbl_dt(cpp_dev);

	if (rc < 0)  {

		pr_err("%s: fail to get frequency table\n", __func__);

		return rc;