summaryrefslogtreecommitdiffstats
path: root/drivers/remoteproc/Makefile
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2016-11-03 19:37:25 -0700
committerBjorn Andersson <bjorn.andersson@linaro.org>2016-11-14 21:52:19 -0800
commit6de1a507c46bf22ed97043495b9ab96e4d5c213b (patch)
treeda576a02806bb50298542d61cbc73e2760737944 /drivers/remoteproc/Makefile
parentcda8529346935fc86f476999ac4fbfe4e17abf11 (diff)
downloadlinux-6de1a507c46bf22ed97043495b9ab96e4d5c213b.tar.gz
linux-6de1a507c46bf22ed97043495b9ab96e4d5c213b.tar.bz2
linux-6de1a507c46bf22ed97043495b9ab96e4d5c213b.zip
remoteproc: qcom_wcnss: Fix circular module dependency
The tie between the main WCNSS driver and the IRIS driver causes a circular dependency between the two modules. Neither part makes sense to have on their own so lets merge them into one module. For the sake of picking up the clock and regulator resources described in the iris of_node we need an associated struct device. But, to keep the size of the patch down we continue to represent the IRIS part as its own platform_driver, within the same module, rather than setting up a dummy device. Fixes: aed361adca9f ("remoteproc: qcom: Introduce WCNSS peripheral image loader") Reported-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc/Makefile')
-rw-r--r--drivers/remoteproc/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
index 6da9b12f9798..d79eeeae6366 100644
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o
obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o
obj-$(CONFIG_QCOM_MDT_LOADER) += qcom_mdt_loader.o
obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o
-obj-$(CONFIG_QCOM_WCNSS_IRIS) += qcom_wcnss_iris.o
-obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss.o
+obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o
+qcom_wcnss_pil-y += qcom_wcnss.o
+qcom_wcnss_pil-y += qcom_wcnss_iris.o
obj-$(CONFIG_ST_REMOTEPROC) += st_remoteproc.o