remoteproc: qcom: Rename Hexagon v5 PAS driver

The Hexagon v5 ADSP driver is used for more than only the ADSP and
there's an upcoming non-PAS ADSP PIL for SDM845, so rename the driver to
qcom_q6v5_pas in order to better suite this.

Cc: Rohit kumar <rohitkr@codeaurora.org>
Reviewed-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 052d4dd347f90c185916b5db0708c20379be599d..425e502c64710cae72107fd6461e5acf0338c310 100644 (file)
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -84,8 +84,16 @@ config KEYSTONE_REMOTEPROC
          It's safe to say N here if you're not interested in the Keystone
          DSPs or just want to use a bare minimum kernel.
 
-config QCOM_ADSP_PIL
-       tristate "Qualcomm ADSP Peripheral Image Loader"
+config QCOM_RPROC_COMMON
+       tristate
+
+config QCOM_Q6V5_COMMON
+       tristate
+       depends on ARCH_QCOM
+       depends on QCOM_SMEM
+
+config QCOM_Q6V5_PAS
+       tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support"
        depends on OF && ARCH_QCOM
        depends on QCOM_SMEM
        depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
@@ -98,15 +106,7 @@ config QCOM_ADSP_PIL
        select QCOM_SCM
        help
          Say y here to support the TrustZone based Peripherial Image Loader
-         for the Qualcomm ADSP remote processors.
-
-config QCOM_RPROC_COMMON
-       tristate
-
-config QCOM_Q6V5_COMMON
-       tristate
-       depends on ARCH_QCOM
-       depends on QCOM_SMEM
+         for the Qualcomm Hexagon v5 based remote processors.
 
 config QCOM_Q6V5_PIL
        tristate "Qualcomm Hexagon V5 Peripherial Image Loader"
@@ -120,8 +120,9 @@ config QCOM_Q6V5_PIL
        select QCOM_RPROC_COMMON
        select QCOM_SCM
        help
-         Say y here to support the Qualcomm Peripherial Image Loader for the
-         Hexagon V5 based remote processors.
+         Say y here to support the TrustZone based Peripherial Image Loader
+         for the Qualcomm Hexagon v5 based remote processors. This is commonly
+         used to control subsystems such as ADSP, Compute and Sensor.
 
 config QCOM_Q6V5_WCSS
        tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"

diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
index 03332fa7e2ee7515d5281c175e632d4a600b3382..eb86c8ba5a871717518273b375c2bce932996b43 100644 (file)
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -14,9 +14,9 @@ obj-$(CONFIG_OMAP_REMOTEPROC)         += omap_remoteproc.o
 obj-$(CONFIG_WKUP_M3_RPROC)            += wkup_m3_rproc.o
 obj-$(CONFIG_DA8XX_REMOTEPROC)         += da8xx_remoteproc.o
 obj-$(CONFIG_KEYSTONE_REMOTEPROC)      += keystone_remoteproc.o
-obj-$(CONFIG_QCOM_ADSP_PIL)            += qcom_adsp_pil.o
 obj-$(CONFIG_QCOM_RPROC_COMMON)                += qcom_common.o
 obj-$(CONFIG_QCOM_Q6V5_COMMON)         += qcom_q6v5.o
+obj-$(CONFIG_QCOM_Q6V5_PAS)            += qcom_q6v5_pas.o
 obj-$(CONFIG_QCOM_Q6V5_PIL)            += qcom_q6v5_pil.o
 obj-$(CONFIG_QCOM_Q6V5_WCSS)           += qcom_q6v5_wcss.o
 obj-$(CONFIG_QCOM_SYSMON)              += qcom_sysmon.o

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_q6v5_pas.c
similarity index 98%
rename from drivers/remoteproc/qcom_adsp_pil.c
rename to drivers/remoteproc/qcom_q6v5_pas.c
index da2254ea11353442b4e943a273128b2bf5256c1a..03edf08c8a2f0c9220e72a4c0539d2a3d4241ffa 100644 (file)
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -376,11 +376,11 @@ static struct platform_driver adsp_driver = {
        .probe = adsp_probe,
        .remove = adsp_remove,
        .driver = {
-               .name = "qcom_adsp_pil",
+               .name = "qcom_q6v5_pas",
                .of_match_table = adsp_of_match,
        },
 };
 
 module_platform_driver(adsp_driver);
-MODULE_DESCRIPTION("Qualcomm MSM8974/MSM8996 ADSP Peripherial Image Loader");
+MODULE_DESCRIPTION("Qualcomm Hexagon v5 Peripheral Authentication Service driver");
 MODULE_LICENSE("GPL v2");