media: venus: core: Add io base variables for each block

New silicon means that the pre-determined offsets we have been using
in this driver no longer hold. Existing blocks of registers can exist at
different offsets relative to the IO base address.

This commit adds a routine to assign the IO base hooks a subsequent commit
will convert from absolute to relative addressing.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 0ffe5b93ca7ec9b4685a8f2d868bf2d62c556e28..639ed691a88d339ba38cfa939c735f9ca37b68b9 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -23,6 +23,7 @@
 #include "core.h"
 #include "firmware.h"
 #include "pm_helpers.h"
+#include "hfi_venus_io.h"
 
 static void venus_coredump(struct venus_core *core)
 {
@@ -207,6 +208,15 @@ err:
        return ret;
 }
 
+static void venus_assign_register_offsets(struct venus_core *core)
+{
+       core->vbif_base = core->base + VBIF_BASE;
+       core->cpu_base = core->base + CPU_BASE;
+       core->cpu_cs_base = core->base + CPU_CS_BASE;
+       core->cpu_ic_base = core->base + CPU_IC_BASE;
+       core->wrapper_base = core->base + WRAPPER_BASE;
+}
+
 static int venus_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -273,6 +283,8 @@ static int venus_probe(struct platform_device *pdev)
        if (ret)
                goto err_core_put;
 
+       venus_assign_register_offsets(core);
+
        ret = v4l2_device_register(dev, &core->v4l2_dev);
        if (ret)
                goto err_core_deinit;

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 4ccac00780a226183234e3dd2d481a5797a3937c..506cf036b3c67f1b75d69ed4ae503ecfccc4f16c 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -90,6 +90,11 @@ struct venus_format {
  * struct venus_core - holds core parameters valid for all instances
  *
  * @base:      IO memory base address
+ * @vbif_base  IO memory vbif base address
+ * @cpu_base   IO memory cpu base address
+ * @cpu_cs_base        IO memory cpu_cs base address
+ * @cpu_ic_base        IO memory cpu_ic base address
+ * @wrapper_base       IO memory wrapper base address
  * @irq:               Venus irq
  * @clks:      an array of struct clk pointers
  * @vcodec0_clks: an array of vcodec0 struct clk pointers
@@ -122,6 +127,11 @@ struct venus_format {
  */
 struct venus_core {
        void __iomem *base;
+       void __iomem *vbif_base;
+       void __iomem *cpu_base;
+       void __iomem *cpu_cs_base;
+       void __iomem *cpu_ic_base;
+       void __iomem *wrapper_base;
        int irq;
        struct clk *clks[VIDC_CLKS_NUM_MAX];
        struct clk *vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX];