remoteproc: clean up notification config

Rearrange the config files for remoteproc and IPA to fix their
interdependencies.

First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the
notification code is built regardless of whether IPA needs it.

Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather
than setting its value to match QCOM_Q6V5_COMMON (which is selected
by QCOM_Q6V5_MSS).

Drop all dependencies from QCOM_Q6V5_IPA_NOTIFY.  The notification
code will be built whenever QCOM_Q6V5_MSS is set, and it has no other
dependencies.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/Kconfig b/drivers/net/ipa/Kconfig
index b8cb7ca..9f0d2a9 100644 (file)
--- a/drivers/net/ipa/Kconfig
+++ b/drivers/net/ipa/Kconfig
@@ -1,9 +1,9 @@
 config QCOM_IPA
        tristate "Qualcomm IPA support"
        depends on ARCH_QCOM && 64BIT && NET
+       depends on QCOM_Q6V5_MSS
        select QCOM_QMI_HELPERS
        select QCOM_MDT_LOADER
-       default QCOM_Q6V5_COMMON
        help
          Choose Y or M here to include support for the Qualcomm
          IP Accelerator (IPA), a hardware block present in some

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 5608463..ffdb5bc 100644 (file)
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -128,6 +128,7 @@ config QCOM_Q6V5_MSS
        select MFD_SYSCON
        select QCOM_MDT_LOADER
        select QCOM_Q6V5_COMMON
+       select QCOM_Q6V5_IPA_NOTIFY
        select QCOM_RPROC_COMMON
        select QCOM_SCM
        help
@@ -169,9 +170,6 @@ config QCOM_Q6V5_WCSS
 
 config QCOM_Q6V5_IPA_NOTIFY
        tristate
-       depends on QCOM_IPA
-       depends on QCOM_Q6V5_MSS
-       default QCOM_IPA
 
 config QCOM_SYSMON
        tristate "Qualcomm sysmon driver"