media: rkisp1: regs: Consolidate MI interrupt wrap fields

Consolidate the wraparound fields in the memory interface interrupt
status registers, so that it can be more succinctly expressed by taking
the stream ID (main or self) as a parameter.

Link: https://lore.kernel.org/r/20231201140433.2126011-2-paul.elder@ideasonboard.com
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index 350f452e676f254aa5b30f17fd74cf6fa3ac848d..bea69a0d766acc9af15108b45f42dd76dfab794a 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -172,12 +172,9 @@
 #define RKISP1_CIF_MI_FRAME(stream)                    BIT((stream)->id)
 #define RKISP1_CIF_MI_MBLK_LINE                                BIT(2)
 #define RKISP1_CIF_MI_FILL_MP_Y                                BIT(3)
-#define RKISP1_CIF_MI_WRAP_MP_Y                                BIT(4)
-#define RKISP1_CIF_MI_WRAP_MP_CB                       BIT(5)
-#define RKISP1_CIF_MI_WRAP_MP_CR                       BIT(6)
-#define RKISP1_CIF_MI_WRAP_SP_Y                                BIT(7)
-#define RKISP1_CIF_MI_WRAP_SP_CB                       BIT(8)
-#define RKISP1_CIF_MI_WRAP_SP_CR                       BIT(9)
+#define RKISP1_CIF_MI_WRAP_Y(stream)                   BIT(4 + (stream)->id * 3)
+#define RKISP1_CIF_MI_WRAP_CB(stream)                  BIT(5 + (stream)->id * 3)
+#define RKISP1_CIF_MI_WRAP_CR(stream)                  BIT(6 + (stream)->id * 3)
 #define RKISP1_CIF_MI_DMA_READY                                BIT(11)
 
 /* MI_STATUS */