Commit 6663ce6f authored by Sibi Sankar's avatar Sibi Sankar Committed by Bjorn Andersson
Browse files

remoteproc: qcom_q6v5_mss: Extract mba/mpss from memory-region



In the absence of mba and mpss sub-child extract the mba/mpss regions
from the memory-region property.

Tested-by: default avatarEvan Green <evgreen@chromium.org>
Signed-off-by: default avatarSibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/20200421143228.8981-5-sibis@codeaurora.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent d964b0b1
Loading
Loading
Loading
Loading
+18 −3
Original line number Diff line number Diff line
@@ -1568,8 +1568,17 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
	struct resource r;
	int ret;

	/*
	 * In the absence of mba/mpss sub-child, extract the mba and mpss
	 * reserved memory regions from device's memory-region property.
	 */
	child = of_get_child_by_name(qproc->dev->of_node, "mba");
	if (!child)
		node = of_parse_phandle(qproc->dev->of_node,
					"memory-region", 0);
	else
		node = of_parse_phandle(child, "memory-region", 0);

	ret = of_address_to_resource(node, 0, &r);
	if (ret) {
		dev_err(qproc->dev, "unable to resolve mba region\n");
@@ -1586,8 +1595,14 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
		return -EBUSY;
	}

	if (!child) {
		node = of_parse_phandle(qproc->dev->of_node,
					"memory-region", 1);
	} else {
		child = of_get_child_by_name(qproc->dev->of_node, "mpss");
		node = of_parse_phandle(child, "memory-region", 0);
	}

	ret = of_address_to_resource(node, 0, &r);
	if (ret) {
		dev_err(qproc->dev, "unable to resolve mpss region\n");