remoteproc: qcom: Compatible string based private resource initialization.

MSS rproc loader need chip specific resources initialization during probe
to load and boot modem firmware, this need compatible string based
differentiation in resources to be initialized. This patch add and provide
a template struct whose fields represent all those resources which are
needed to load and boot modem fw and which may differ from chip to chip.
This patch also add new compatible string for msm8916, msm8974 platform.

Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
index 57cb49ec55caa0a71c1fbdbc77e74aecc127b656..92347fe6890e2b5d6f1e72f3b8ac43fd245d832a 100644 (file)
--- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
@@ -7,7 +7,9 @@ on the Qualcomm Hexagon core.
        Usage: required
        Value type: <string>
        Definition: must be one of:
-                   "qcom,q6v5-pil"
+                   "qcom,q6v5-pil",
+                   "qcom,msm8916-mss-pil",
+                   "qcom,msm8974-mss-pil"
 
 - reg:
        Usage: required

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index b08989b48df7bad5b4e9fb0ef11f81ee369363b9..1bebe88fdb623586b907dc4577bc74d1caeeb30b 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -23,6 +23,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -36,7 +37,6 @@
 
 #include <linux/qcom_scm.h>
 
-#define MBA_FIRMWARE_NAME              "mba.b00"
 #define MPSS_FIRMWARE_NAME             "modem.mdt"
 
 #define MPSS_CRASH_REASON_SMEM         421
@@ -93,6 +93,10 @@
 #define QDSS_BHS_ON                    BIT(21)
 #define QDSS_LDO_BYP                   BIT(22)
 
+struct rproc_hexagon_res {
+       const char *hexagon_mba_image;
+};
+
 struct q6v5 {
        struct device *dev;
        struct rproc *rproc;
@@ -805,12 +809,17 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
 
 static int q6v5_probe(struct platform_device *pdev)
 {
+       const struct rproc_hexagon_res *desc;
        struct q6v5 *qproc;
        struct rproc *rproc;
        int ret;
 
+       desc = of_device_get_match_data(&pdev->dev);
+       if (!desc)
+               return -EINVAL;
+
        rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops,
-                           MBA_FIRMWARE_NAME, sizeof(*qproc));
+                           desc->hexagon_mba_image, sizeof(*qproc));
        if (!rproc) {
                dev_err(&pdev->dev, "failed to allocate rproc\n");
                return -ENOMEM;
@@ -890,8 +899,18 @@ static int q6v5_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct rproc_hexagon_res msm8916_mss = {
+       .hexagon_mba_image = "mba.mbn",
+};
+
+static const struct rproc_hexagon_res msm8974_mss = {
+       .hexagon_mba_image = "mba.b00",
+};
+
 static const struct of_device_id q6v5_of_match[] = {
-       { .compatible = "qcom,q6v5-pil", },
+       { .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
+       { .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},
+       { .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss},
        { },
 };
 MODULE_DEVICE_TABLE(of, q6v5_of_match);