media: hantro: add support for separate control block

On i.MX8MQ/MM a separate control block contains registers for per-core
resets, clock gating, and fuse register control.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h
index e8eb747f22ef0c39d9142211db53c9900e8c1ada..5c2f87272ce2648e2670cd685e4c3354fc7dd192 100644 (file)
--- a/drivers/staging/media/hantro/hantro.h
+++ b/drivers/staging/media/hantro/hantro.h
@@ -167,6 +167,7 @@ hantro_vdev_to_func(struct video_device *vdev)
  * @reg_bases:         Mapped addresses of VPU registers.
  * @enc_base:          Mapped address of VPU encoder register for convenience.
  * @dec_base:          Mapped address of VPU decoder register for convenience.
+ * @ctrl_base:         Mapped address of VPU control block.
  * @vpu_mutex:         Mutex to synchronize V4L2 calls.
  * @irqlock:           Spinlock to synchronize access to data structures
  *                     shared with interrupt handlers.
@@ -185,6 +186,7 @@ struct hantro_dev {
        void __iomem **reg_bases;
        void __iomem *enc_base;
        void __iomem *dec_base;
+       void __iomem *ctrl_base;
 
        struct mutex vpu_mutex; /* video_device lock */
        spinlock_t irqlock;