remoteproc: qcom: fix glink dependencies

[linux-2.6-microblaze.git] / drivers / remoteproc / Kconfig

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 9e7efe5..15d1574 100644 (file)
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -155,6 +155,7 @@ config QCOM_Q6V5_ADSP
        depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
        depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
        depends on QCOM_SYSMON || QCOM_SYSMON=n
+       depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
        select MFD_SYSCON
        select QCOM_PIL_INFO
        select QCOM_MDT_LOADER
@@ -162,7 +163,9 @@ config QCOM_Q6V5_ADSP
        select QCOM_RPROC_COMMON
        help
          Say y here to support the Peripheral Image Loader
-         for the Qualcomm Technology Inc. ADSP remote processors.
+         for the non-TrustZone part of Qualcomm Technology Inc. ADSP and CDSP
+         remote processors. The TrustZone part is handled by QCOM_Q6V5_PAS
+         driver.
 
 config QCOM_Q6V5_MSS
        tristate "Qualcomm Hexagon V5 self-authenticating modem subsystem support"
@@ -171,6 +174,7 @@ config QCOM_Q6V5_MSS
        depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
        depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
        depends on QCOM_SYSMON || QCOM_SYSMON=n
+       depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
        select MFD_SYSCON
        select QCOM_MDT_LOADER
        select QCOM_PIL_INFO
@@ -179,7 +183,8 @@ config QCOM_Q6V5_MSS
        select QCOM_SCM
        help
          Say y here to support the Qualcomm self-authenticating modem
-         subsystem based on Hexagon V5.
+         subsystem based on Hexagon V5. The TrustZone based system is
+         handled by QCOM_Q6V5_PAS driver.
 
 config QCOM_Q6V5_PAS
        tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support"
@@ -188,6 +193,7 @@ config QCOM_Q6V5_PAS
        depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
        depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
        depends on QCOM_SYSMON || QCOM_SYSMON=n
+       depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
        select MFD_SYSCON
        select QCOM_PIL_INFO
        select QCOM_MDT_LOADER
@@ -197,7 +203,9 @@ config QCOM_Q6V5_PAS
        help
          Say y here to support the TrustZone based Peripheral Image Loader
          for the Qualcomm Hexagon v5 based remote processors. This is commonly
-         used to control subsystems such as ADSP, Compute and Sensor.
+         used to control subsystems such as ADSP (Audio DSP),
+         CDSP (Compute DSP), MPSS (Modem Peripheral SubSystem), and
+         SLPI (Sensor Low Power Island).
 
 config QCOM_Q6V5_WCSS
        tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
@@ -206,6 +214,7 @@ config QCOM_Q6V5_WCSS
        depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
        depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
        depends on QCOM_SYSMON || QCOM_SYSMON=n
+       depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
        select MFD_SYSCON
        select QCOM_MDT_LOADER
        select QCOM_PIL_INFO
@@ -214,7 +223,8 @@ config QCOM_Q6V5_WCSS
        select QCOM_SCM
        help
          Say y here to support the Qualcomm Peripheral Image Loader for the
-         Hexagon V5 based WCSS remote processors.
+         Hexagon V5 based WCSS remote processors on e.g. IPQ8074.  This is
+         a non-TrustZone wireless subsystem.
 
 config QCOM_SYSMON
        tristate "Qualcomm sysmon driver"
@@ -238,13 +248,16 @@ config QCOM_WCNSS_PIL
        depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
        depends on QCOM_SMEM
        depends on QCOM_SYSMON || QCOM_SYSMON=n
+       depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
        select QCOM_MDT_LOADER
        select QCOM_PIL_INFO
        select QCOM_RPROC_COMMON
        select QCOM_SCM
        help
-         Say y here to support the Peripheral Image Loader for the Qualcomm
-         Wireless Connectivity Subsystem.
+         Say y here to support the Peripheral Image Loader for loading WCNSS
+         firmware and boot the core on e.g. MSM8974, MSM8916. The firmware is
+         verified and booted with the help of the Peripheral Authentication
+         System (PAS) in TrustZone.
 
 config ST_REMOTEPROC
        tristate "ST remoteproc support"