[PATCH v4 01/10] remoteproc: qcom: Add and initialize private data for hexagon dsp.

[Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>]

Embed resources specific to version of hexagon chip in device
structure to avoid conditional check for manipulation of those
resources in driver code.

Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
---
 .../devicetree/bindings/remoteproc/qcom,q6v5.txt   |  1 +
 drivers/remoteproc/qcom_q6v5_pil.c                 | 48 +++++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
index 57cb49e..cbc165c 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
@@ -8,6 +8,7 @@ on the Qualcomm Hexagon core.
 	Value type: <string>
 	Definition: must be one of:
 		    "qcom,q6v5-pil"
+		"qcom,q6v56-pil"
 
 - reg:
 	Usage: required
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 2e0caaa..7660012 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -30,13 +30,14 @@
 #include <linux/reset.h>
 #include <linux/soc/qcom/smem.h>
 #include <linux/soc/qcom/smem_state.h>
+#include <linux/of_device.h>
 
 #include "remoteproc_internal.h"
 #include "qcom_mdt_loader.h"
 
 #include <linux/qcom_scm.h>
 
-#define MBA_FIRMWARE_NAME		"mba.b00"
+#define MBA_FIRMWARE_NAME              "mba.b00"
 #define MPSS_FIRMWARE_NAME		"modem.mdt"
 
 #define MPSS_CRASH_REASON_SMEM		421
@@ -93,6 +94,23 @@
 #define QDSS_BHS_ON			BIT(21)
 #define QDSS_LDO_BYP			BIT(22)
 
+struct q6_rproc_res {
+	char *q6_mba_image;
+	int (*q6_reset_init)(void *q, void *p);
+	char **proxy_reg_string;
+	char **active_reg_string;
+	int **proxy_voltage_load;
+	int **active_voltage_load;
+	char **proxy_clk_string;
+	char **active_clk_string;
+};
+
+struct reg_info {
+	struct regulator *reg;
+	int uV;
+	int uA;
+};
+
 struct q6v5 {
 	struct device *dev;
 	struct rproc *rproc;
@@ -890,8 +908,34 @@ static int q6v5_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static char *proxy_q6v56_regulator_namestr[] = {"mx", "cx", "pll", NULL};
+static int proxy_q6v56_voltage_load[3][2] = { {1050000, 0}, {0, 100000},
+		{0, 100000} };
+static char *proxy_q6v56_clk_namestr[] = {"xo", "pnoc", "qdss", NULL};
+static char *active_q6v56_clk_namestr[] = {"iface", "bus", "mem",
+		"gpll0_mss_clk", "snoc_axi_clk", "mnoc_axi_clk", NULL};
+
+static const struct q6_rproc_res q6v56_res = {
+	.q6_reset_init = NULL,
+	.q6_mba_image = "mba.mbn",
+	.proxy_reg_string = proxy_q6v56_regulator_namestr,
+	.active_reg_string = NULL,
+	.proxy_voltage_load = (int **)proxy_q6v56_voltage_load,
+	.active_voltage_load = NULL,
+	.proxy_clk_string = proxy_q6v56_clk_namestr,
+	.active_clk_string = active_q6v56_clk_namestr,
+};
+
+static const struct q6_rproc_res q6v5_res = {
+	.q6_reset_init = NULL,
+	.q6_mba_image = "mba.mbn",
+	.proxy_reg_string = proxy_q6v56_regulator_namestr,
+	.proxy_voltage_load = (int **)proxy_q6v56_voltage_load,
+};
+
 static const struct of_device_id q6v5_of_match[] = {
-	{ .compatible = "qcom,q6v5-pil", },
+	{ .compatible = "qcom,q6v5-pil", .data = &q6v5_res},
+	{ .compatible = "qcom,q6v56-pil", .data = &q6v56_res},
 	{ },
 };
 
-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.