Merge branch 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

diff --cc drivers/remoteproc/Kconfig
index c199b360067f4f25327d39623d43fc0a9f2b80fc,14d5d2d43a385932b76f2b9d14c855eb25079946..9c41128750caf5dd98f67f1fe80fb167d5a4240b
--- 1/drivers/remoteproc/Kconfig
--- 2/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -106,9 -100,10 +107,9 @@@ config QCOM_WCNSS_PI
        tristate "Qualcomm WCNSS Peripheral Image Loader"
        depends on OF && ARCH_QCOM
        depends on QCOM_SMEM
+       depends on REMOTEPROC
        select QCOM_MDT_LOADER
        select QCOM_SCM
-       select REMOTEPROC
 -      select QCOM_WCNSS_IRIS
        help
          Say y here to support the Peripheral Image Loader for the Qualcomm
          Wireless Connectivity Subsystem.

diff --cc drivers/remoteproc/Makefile
index 523f5128a1f10fd3260f3d377209d012823ef943,924f0cb254708605c23ade1083214edab7e42df1..6290c3f72e831284e6d0e274db948268f9ce6f45
--- 1/drivers/remoteproc/Makefile
--- 2/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@@ -12,10 -11,9 +12,11 @@@ obj-$(CONFIG_OMAP_REMOTEPROC)               += omap_
  obj-$(CONFIG_STE_MODEM_RPROC)         += ste_modem_rproc.o
  obj-$(CONFIG_WKUP_M3_RPROC)           += wkup_m3_rproc.o
  obj-$(CONFIG_DA8XX_REMOTEPROC)                += da8xx_remoteproc.o
 +obj-$(CONFIG_QCOM_ADSP_PIL)           += qcom_adsp_pil.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
+ obj-$(CONFIG_ST_SLIM_REMOTEPROC)      += st_slim_rproc.o