Hi Kieran,
Thank you for the patch.
On Fri, Jun 18, 2021 at 05:10:41PM +0100, Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
>
> The WPF IRQ enable and status macros have been incorrectly named WFP.
> Fix them accordingly, and update all uses of the macros.
>
> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
Wow, and all this time it has escaped our eyes.
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Feel free to push. Oh, wait... I'm too used to libcamera :-)
> ---
> drivers/media/platform/vsp1/vsp1_drv.c | 4 ++--
> drivers/media/platform/vsp1/vsp1_regs.h | 8 ++++----
> drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
> index de442d6c9926..1018786d0437 100644
> --- a/drivers/media/platform/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/vsp1/vsp1_drv.c
> @@ -44,7 +44,7 @@
>
> static irqreturn_t vsp1_irq_handler(int irq, void *data)
> {
> - u32 mask = VI6_WFP_IRQ_STA_DFE | VI6_WFP_IRQ_STA_FRE;
> + u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE;
> struct vsp1_device *vsp1 = data;
> irqreturn_t ret = IRQ_NONE;
> unsigned int i;
> @@ -59,7 +59,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
> status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));
> vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);
>
> - if (status & VI6_WFP_IRQ_STA_DFE) {
> + if (status & VI6_WPF_IRQ_STA_DFE) {
> vsp1_pipeline_frame_end(wpf->entity.pipe);
> ret = IRQ_HANDLED;
> }
> diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
> index fe3130db1fa2..97942436868c 100644
> --- a/drivers/media/platform/vsp1/vsp1_regs.h
> +++ b/drivers/media/platform/vsp1/vsp1_regs.h
> @@ -32,12 +32,12 @@
> #define VI6_STATUS_SYS_ACT(n) BIT((n) + 8)
>
> #define VI6_WPF_IRQ_ENB(n) (0x0048 + (n) * 12)
> -#define VI6_WFP_IRQ_ENB_DFEE BIT(1)
> -#define VI6_WFP_IRQ_ENB_FREE BIT(0)
> +#define VI6_WPF_IRQ_ENB_DFEE BIT(1)
> +#define VI6_WPF_IRQ_ENB_FREE BIT(0)
>
> #define VI6_WPF_IRQ_STA(n) (0x004c + (n) * 12)
> -#define VI6_WFP_IRQ_STA_DFE BIT(1)
> -#define VI6_WFP_IRQ_STA_FRE BIT(0)
> +#define VI6_WPF_IRQ_STA_DFE BIT(1)
> +#define VI6_WPF_IRQ_STA_FRE BIT(0)
>
> #define VI6_DISP_IRQ_ENB(n) (0x0078 + (n) * 60)
> #define VI6_DISP_IRQ_ENB_DSTE BIT(8)
> diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
> index 208498fa6ed7..94e91d7bb56c 100644
> --- a/drivers/media/platform/vsp1/vsp1_wpf.c
> +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
> @@ -342,7 +342,7 @@ static void wpf_configure_stream(struct vsp1_entity *entity,
> /* Enable interrupts. */
> vsp1_dl_body_write(dlb, VI6_WPF_IRQ_STA(index), 0);
> vsp1_dl_body_write(dlb, VI6_WPF_IRQ_ENB(index),
> - VI6_WFP_IRQ_ENB_DFEE);
> + VI6_WPF_IRQ_ENB_DFEE);
>
> /*
> * Configure writeback for display pipelines (the wpf writeback flag is
--
Regards,
Laurent Pinchart
