aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanimir Varbanov <stanimir.varbanov@linaro.org>2015-08-21 16:37:57 +0300
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2016-07-19 18:10:09 +0100
commit4c63f4b9b70f7001a4697dd2945c6782df5e5aa8 (patch)
tree5296effecd5914dcbd97bb703c86ea11200abdd6
parent71bc7cf28a85c813f64b40d18b2366d2722665c1 (diff)
remoteproc: tz_pil: take relocation flag into account
when setup memory by scm call Signed-off-by: Andy Gross <agross@codeaurora.org> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
-rw-r--r--drivers/remoteproc/qcom_tz_pil.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/remoteproc/qcom_tz_pil.c b/drivers/remoteproc/qcom_tz_pil.c
index 96395882969ce..cdc2e1f233f27 100644
--- a/drivers/remoteproc/qcom_tz_pil.c
+++ b/drivers/remoteproc/qcom_tz_pil.c
@@ -280,7 +280,8 @@ static int qproc_load(struct rproc *rproc, const struct firmware *fw)
diff_addr = max_addr - min_addr;
dev_dbg(qproc->dev, "pas_mem_setup %pa, %pa\n", &min_addr, &diff_addr);
- ret = qcom_scm_pas_mem_setup(qproc->pas_id, min_addr, max_addr - min_addr);
+ ret = qcom_scm_pas_mem_setup(qproc->pas_id,
+ relocatable ? qproc->reloc_phys : min_addr, max_addr - min_addr);
if (ret) {
dev_err(qproc->dev, "unable to setup memory for image\n");
return -EINVAL;