media: venus: core: Add an io base for TZ wrapper regs

6xx silicon needs to access registers from a wrapper trust-zone base
address range.
This commit defines the necessary variable for later use.

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 639ed691a88d339ba38cfa939c735f9ca37b68b9..6578e3b0c3860b5501223d4104a9f94efd1ceb6a 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -215,6 +215,7 @@ static void venus_assign_register_offsets(struct venus_core *core)
        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;
+       core->wrapper_tz_base = 0;
 }
 
 static int venus_probe(struct platform_device *pdev)

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 8fb065c0549dca3276ee7ddb1008ff1551ea4441..1bb08d6f90549facbd7866bf5b4f2fd4ef26cc8f 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -95,6 +95,7 @@ struct venus_format {
  * @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
+ * @wrapper_base       IO memory wrapper TZ base address
  * @irq:               Venus irq
  * @clks:      an array of struct clk pointers
  * @vcodec0_clks: an array of vcodec0 struct clk pointers
@@ -132,6 +133,7 @@ struct venus_core {
        void __iomem *cpu_cs_base;
        void __iomem *cpu_ic_base;
        void __iomem *wrapper_base;
+       void __iomem *wrapper_tz_base;
        int irq;
        struct clk *clks[VIDC_CLKS_NUM_MAX];
        struct clk *vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX];