All of lore.kernel.org
 help / color / mirror / Atom feed
From: Biju Das <biju.das.jz@bp.renesas.com>
To: cip-dev@lists.cip-project.org,
	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
	Pavel Machek <pavel@denx.de>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
	Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: [PATCH 5.10.y-cip 04/18] media: vsp1: Fix WPF macro names
Date: Thu,  7 Dec 2023 13:46:43 +0000	[thread overview]
Message-ID: <20231207134657.371420-5-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20231207134657.371420-1-biju.das.jz@bp.renesas.com>

From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

commit e73396fee2614145e2f77a88cafbfc25183994f8 upstream.

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@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 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 8acd6d45d8d0..bb256e36bda4 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
-- 
2.25.1



  parent reply	other threads:[~2023-12-07 13:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-07 13:46 [PATCH 5.10.y-cip 00/18] Add VSPD/FCPVD support Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 01/18] device property: Add const qualifier to device_get_match_data() parameter Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 02/18] media: vsp1: use pm_runtime_resume_and_get() Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 03/18] media: vsp1: Make use of the helper function devm_platform_ioremap_resource() Biju Das
2023-12-07 13:46 ` Biju Das [this message]
2023-12-07 13:46 ` [PATCH 5.10.y-cip 05/18] media: vsp1: Simplify DRM UIF handling Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 06/18] media: vsp1: Use platform_get_irq() to get the interrupt Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 07/18] media: vsp1: mask interrupts before enabling Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 08/18] media: renesas: vsp1: Add support to deassert/assert reset line Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 09/18] media: renesas: vsp1: Add support for VSP software version Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 10/18] media: vsp1: Use BIT macro for feature identification Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 11/18] media: renesas: vsp1: Add VSP1_HAS_NON_ZERO_LBA feature bit Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 12/18] media: dt-bindings: media: renesas,vsp1: Document RZ/G2L VSPD bindings Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 13/18] media: dt-bindings: media: renesas,vsp1: Document RZ/V2L " Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 14/18] media: renesas: vsp1: Add support for RZ/G2L VSPD Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 15/18] arm64: dts: renesas: r9a07g044: Add fcpvd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 16/18] arm64: dts: renesas: r9a07g044: Add vspd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 17/18] arm64: dts: renesas: r9a07g054: Add fcpvd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 18/18] arm64: dts: renesas: r9a07g054: Add vspd node Biju Das
2023-12-07 19:10 ` [PATCH 5.10.y-cip 00/18] Add VSPD/FCPVD support Pavel Machek
2023-12-07 19:18   ` Biju Das
2023-12-08 13:14 ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231207134657.371420-5-biju.das.jz@bp.renesas.com \
    --to=biju.das.jz@bp.renesas.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=nobuhiro1.iwamatsu@toshiba.co.jp \
    --cc=pavel@denx.de \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.