remoteproc: qcom: Use common SMD edge handler

Call the common SMD edge handler to instantiate subdevices to bring
associated SMD edges up and down as the remoteproc is started and
stopped.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

3 files changed, 14 insertions, 0 deletions

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 555dba04b5ae..402de7089302 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -76,6 +76,7 @@ config QCOM_ADSP_PIL
         depends on OF && ARCH_QCOM
         depends on REMOTEPROC
         depends on QCOM_SMEM
+        depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n)
         select MFD_SYSCON
         select QCOM_MDT_LOADER
         select QCOM_RPROC_COMMON
@@ -92,6 +93,7 @@ config QCOM_Q6V5_PIL
         depends on OF && ARCH_QCOM
         depends on QCOM_SMEM
         depends on REMOTEPROC
+        depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n)
         select MFD_SYSCON
         select QCOM_RPROC_COMMON
         select QCOM_SCM
diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index 301b820216f6..f1b147c96d44 100644
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_adsp_pil.c
@@ -70,6 +70,8 @@ struct qcom_adsp {
         phys_addr_t mem_reloc;
         void *mem_region;
         size_t mem_size;
+
+        struct qcom_rproc_subdev smd_subdev;
 };
 
 static int adsp_load(struct rproc *rproc, const struct firmware *fw)
@@ -404,6 +406,8 @@ static int adsp_probe(struct platform_device *pdev)
                 goto free_rproc;
         }
 
+        qcom_add_smd_subdev(rproc, &adsp->smd_subdev);
+
         ret = rproc_add(rproc);
         if (ret)
                 goto free_rproc;
@@ -422,6 +426,8 @@ static int adsp_remove(struct platform_device *pdev)
 
         qcom_smem_state_put(adsp->state);
         rproc_del(adsp->rproc);
+
+        qcom_remove_smd_subdev(adsp->rproc, &adsp->smd_subdev);
         rproc_free(adsp->rproc);
 
         return 0;
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index b129261d7e5e..26446eb08bd8 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -151,6 +151,8 @@ struct q6v5 {
         phys_addr_t mpss_reloc;
         void *mpss_region;
         size_t mpss_size;
+
+        struct qcom_rproc_subdev smd_subdev;
 };
 
 static int q6v5_regulator_init(struct device *dev, struct reg_info *regs,
@@ -1035,6 +1037,8 @@ static int q6v5_probe(struct platform_device *pdev)
                 goto free_rproc;
         }
 
+        qcom_add_smd_subdev(rproc, &qproc->smd_subdev);
+
         ret = rproc_add(rproc);
         if (ret)
                 goto free_rproc;
@@ -1052,6 +1056,8 @@ static int q6v5_remove(struct platform_device *pdev)
         struct q6v5 *qproc = platform_get_drvdata(pdev);
 
         rproc_del(qproc->rproc);
+
+        qcom_remove_smd_subdev(qproc->rproc, &qproc->smd_subdev);
         rproc_free(qproc->rproc);
 
         return 0;