media: ti-vpe: cal: rename CAL_HL_IRQ_MASK

CAL_HL_IRQ_MASK macro is used for both WDMA start and end status bits.
For clarity, rename CAL_HL_IRQ_MASK macro to CAL_HL_IRQ_WDMA_END_MASK
and CAL_HL_IRQ_WDMA_START_MASK.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 21584ff..673952b 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -452,9 +452,9 @@ void cal_ctx_start(struct cal_ctx *ctx)
 
        /* Enable IRQ_WDMA_END and IRQ_WDMA_START. */
        cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(1),
-                 CAL_HL_IRQ_MASK(ctx->dma_ctx));
+                 CAL_HL_IRQ_WDMA_END_MASK(ctx->dma_ctx));
        cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(2),
-                 CAL_HL_IRQ_MASK(ctx->dma_ctx));
+                 CAL_HL_IRQ_WDMA_START_MASK(ctx->dma_ctx));
 }
 
 void cal_ctx_stop(struct cal_ctx *ctx)
@@ -478,9 +478,9 @@ void cal_ctx_stop(struct cal_ctx *ctx)
 
        /* Disable IRQ_WDMA_END and IRQ_WDMA_START. */
        cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(1),
-                 CAL_HL_IRQ_MASK(ctx->dma_ctx));
+                 CAL_HL_IRQ_WDMA_END_MASK(ctx->dma_ctx));
        cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(2),
-                 CAL_HL_IRQ_MASK(ctx->dma_ctx));
+                 CAL_HL_IRQ_WDMA_START_MASK(ctx->dma_ctx));
 
        ctx->dma.state = CAL_DMA_STOPPED;
 }
@@ -588,7 +588,7 @@ static irqreturn_t cal_irq(int irq_cal, void *data)
                cal_write(cal, CAL_HL_IRQSTATUS(1), status);
 
                for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) {
-                       if (status & CAL_HL_IRQ_MASK(i))
+                       if (status & CAL_HL_IRQ_WDMA_END_MASK(i))
                                cal_irq_wdma_end(cal->ctx[i]);
                }
        }
@@ -602,7 +602,7 @@ static irqreturn_t cal_irq(int irq_cal, void *data)
                cal_write(cal, CAL_HL_IRQSTATUS(2), status);
 
                for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) {
-                       if (status & CAL_HL_IRQ_MASK(i))
+                       if (status & CAL_HL_IRQ_WDMA_START_MASK(i))
                                cal_irq_wdma_start(cal->ctx[i]);
                }
        }

diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h
index bf93791..94cb4f3 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal_regs.h
+++ b/drivers/media/platform/ti-vpe/cal_regs.h
@@ -125,7 +125,8 @@
 #define CAL_HL_IRQ_EOI_LINE_NUMBER_READ0               0
 #define CAL_HL_IRQ_EOI_LINE_NUMBER_EOI0                        0
 
-#define CAL_HL_IRQ_MASK(m)                     BIT(m)
+#define CAL_HL_IRQ_WDMA_END_MASK(m)            BIT(m)
+#define CAL_HL_IRQ_WDMA_START_MASK(m)          BIT(m)
 
 #define CAL_HL_IRQ_OCPO_ERR_MASK               BIT(6)