From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-media@vger.kernel.org, Benoit Parrot <bparrot@ti.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Subject: Re: [PATCH 08/16] media: ti-vpe: cal: use reg_write_field
Date: Mon, 16 Mar 2020 14:32:59 +0200 [thread overview]
Message-ID: <20200316123259.GA4732@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20200313114121.32182-8-tomi.valkeinen@ti.com>
Hi Tomi,
Thank you for the patch.
On Fri, Mar 13, 2020 at 01:41:13PM +0200, Tomi Valkeinen wrote:
> Simplify the code by using reg_write_field() where trivially possible.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I wonder if it would make sense to use regmap.
> ---
> drivers/media/platform/ti-vpe/cal.c | 34 ++++++++++++-----------------
> 1 file changed, 14 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index cd788c6687cb..ebea5fa28691 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -759,10 +759,9 @@ static void csi2_phy_init(struct cal_ctx *ctx)
> camerarx_phy_enable(ctx);
>
> /* 2. Reset complex IO - Do not wait for reset completion */
> - val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
> - set_field(&val, CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL,
> - CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
> - reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
> + reg_write_field(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
> + CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL,
> + CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
> ctx_dbg(3, ctx, "CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x De-assert Complex IO Reset\n",
> ctx->csi2_port,
> reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port)));
> @@ -784,18 +783,16 @@ static void csi2_phy_init(struct cal_ctx *ctx)
> reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port)));
>
> /* 4. Force FORCERXMODE */
> - val = reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port));
> - set_field(&val, 1, CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK);
> - reg_write(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port), val);
> + reg_write_field(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port),
> + 1, CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK);
> ctx_dbg(3, ctx, "CAL_CSI2_TIMING(%d) = 0x%08x Force RXMODE\n",
> ctx->csi2_port,
> reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port)));
>
> /* E. Power up the PHY using the complex IO */
> - val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
> - set_field(&val, CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON,
> - CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK);
> - reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
> + reg_write_field(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
> + CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON,
> + CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK);
>
> /* F. Wait for power up completion */
> for (i = 0; i < 10; i++) {
> @@ -867,13 +864,11 @@ static void csi2_wait_for_phy(struct cal_ctx *ctx)
> static void csi2_phy_deinit(struct cal_ctx *ctx)
> {
> int i;
> - u32 val;
>
> /* Power down the PHY using the complex IO */
> - val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
> - set_field(&val, CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF,
> - CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK);
> - reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
> + reg_write_field(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
> + CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF,
> + CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK);
>
> /* Wait for power down completion */
> for (i = 0; i < 10; i++) {
> @@ -890,10 +885,9 @@ static void csi2_phy_deinit(struct cal_ctx *ctx)
> (i >= 10) ? "(timeout)" : "");
>
> /* Assert Comple IO Reset */
> - val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
> - set_field(&val, CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL,
> - CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
> - reg_write(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port), val);
> + reg_write_field(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
> + CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL,
> + CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
>
> /* Wait for power down completion */
> for (i = 0; i < 10; i++) {
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2020-03-16 12:33 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 11:41 [PATCH 01/16] media: ti-vpe: cal: fix use of wrong macro Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 02/16] media: ti-vpe: cal: use runtime_resume for errata handling Tomi Valkeinen
2020-03-16 12:28 ` Laurent Pinchart
2020-03-17 8:54 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 03/16] media: ti-vpe: cal: catch error irqs and print errors Tomi Valkeinen
2020-03-16 10:06 ` Hans Verkuil
2020-03-16 10:51 ` Hans Verkuil
2020-03-16 12:00 ` Tomi Valkeinen
2020-03-16 12:16 ` Hans Verkuil
2020-03-16 12:22 ` Laurent Pinchart
2020-03-17 8:56 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 04/16] media: ti-vpe: cal: print errors on timeouts Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 05/16] media: ti-vpe: cal: simplify irq handling Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 06/16] media: ti-vpe: cal: remove useless CAL_GEN_* macros Tomi Valkeinen
2020-03-16 12:24 ` Laurent Pinchart
2020-03-13 11:41 ` [PATCH 07/16] media: ti-vpe: cal: remove unused defines Tomi Valkeinen
2020-03-16 12:31 ` Laurent Pinchart
2020-03-13 11:41 ` [PATCH 08/16] media: ti-vpe: cal: use reg_write_field Tomi Valkeinen
2020-03-16 12:32 ` Laurent Pinchart [this message]
2020-03-13 11:41 ` [PATCH 09/16] media: ti-vpe: cal: cleanup CIO power enable/disable Tomi Valkeinen
2020-03-16 12:35 ` Laurent Pinchart
2020-03-13 11:41 ` [PATCH 10/16] media: ti-vpe: cal: fix dummy read to phy Tomi Valkeinen
2020-03-16 12:36 ` Laurent Pinchart
2020-03-13 11:41 ` [PATCH 11/16] media: ti-vpe: cal: program number of lines properly Tomi Valkeinen
2020-03-16 12:37 ` Laurent Pinchart
2020-03-16 13:13 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 12/16] media: ti-vpe: cal: set DMA max seg size Tomi Valkeinen
2020-03-16 12:39 ` Laurent Pinchart
2020-03-13 11:41 ` [PATCH 13/16] media: ti-vpe: cal: move code to separate functions Tomi Valkeinen
2020-03-16 12:41 ` Laurent Pinchart
2020-03-17 9:04 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 14/16] media: ti-vpe: cal: improve wait for CIO resetdone Tomi Valkeinen
2020-03-16 10:05 ` Hans Verkuil
2020-03-16 10:11 ` Tomi Valkeinen
2020-03-16 12:43 ` Laurent Pinchart
2020-03-17 11:34 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 15/16] media: ti-vpe: cal: improve wait for stop-state Tomi Valkeinen
2020-03-16 12:45 ` Laurent Pinchart
2020-03-17 11:44 ` Tomi Valkeinen
2020-03-13 11:41 ` [PATCH 16/16] media: ti-vpe: cal: fix stop state timeout Tomi Valkeinen
2020-03-16 12:49 ` Laurent Pinchart
2020-03-16 12:28 ` [PATCH 01/16] media: ti-vpe: cal: fix use of wrong macro Laurent Pinchart
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=20200316123259.GA4732@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=bparrot@ti.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tomi.valkeinen@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox