diff mbox series

[10/16] media: ti-vpe: cal: fix dummy read to phy

Message ID	20200313114121.32182-10-tomi.valkeinen@ti.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Hans Verkuil
Headers	From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: <linux-media@vger.kernel.org>, Benoit Parrot <bparrot@ti.com> CC: Mauro Carvalho Chehab <mchehab@kernel.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 10/16] media: ti-vpe: cal: fix dummy read to phy Date: Fri, 13 Mar 2020 13:41:15 +0200 Message-ID: <20200313114121.32182-10-tomi.valkeinen@ti.com> In-Reply-To: <20200313114121.32182-1-tomi.valkeinen@ti.com> References: <20200313114121.32182-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	[01/16] media: ti-vpe: cal: fix use of wrong macro \| [01/16] media: ti-vpe: cal: fix use of wrong macro [02/16] media: ti-vpe: cal: use runtime_resume for errata handling [03/16] media: ti-vpe: cal: catch error irqs and print errors [04/16] media: ti-vpe: cal: print errors on timeouts [05/16] media: ti-vpe: cal: simplify irq handling [06/16] media: ti-vpe: cal: remove useless CAL_GEN_* macros [07/16] media: ti-vpe: cal: remove unused defines [08/16] media: ti-vpe: cal: use reg_write_field [09/16] media: ti-vpe: cal: cleanup CIO power enable/disable [10/16] media: ti-vpe: cal: fix dummy read to phy [11/16] media: ti-vpe: cal: program number of lines properly [12/16] media: ti-vpe: cal: set DMA max seg size [13/16] media: ti-vpe: cal: move code to separate functions [14/16] media: ti-vpe: cal: improve wait for CIO resetdone [15/16] media: ti-vpe: cal: improve wait for stop-state [16/16] media: ti-vpe: cal: fix stop state timeout

Commit Message

Tomi Valkeinen March 13, 2020, 11:41 a.m. UTC

  After ComplexIO reset, a dummy read to PHY is needed as per CAL spec to
finish the reset. Currently the driver reads a ComplexIO register, not
PHY register. Fix this.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/media/platform/ti-vpe/cal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Laurent Pinchart March 16, 2020, 12:36 p.m. UTC | #1

Hi Tomi,

Thank you for the patch.

On Fri, Mar 13, 2020 at 01:41:15PM +0200, Tomi Valkeinen wrote:
> After ComplexIO reset, a dummy read to PHY is needed as per CAL spec to
> finish the reset. Currently the driver reads a ComplexIO register, not
> PHY register. Fix this.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/ti-vpe/cal.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 771ad7c14c96..b5fd90a1ec09 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -795,8 +795,8 @@ static void csi2_phy_init(struct cal_ctx *ctx)
>  		ctx->csi2_port,
>  		reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port)));
>  
> -	/* Dummy read to allow SCP to complete */
> -	val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
> +	/* Dummy read to allow SCP reset to complete */
> +	reg_read(ctx->cc, CAL_CSI2_PHY_REG0);
>  
>  	/* 3.A. Program Phy Timing Parameters */
>  	csi2_phy_config(ctx);

diff mbox series

Patch

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 771ad7c14c96..b5fd90a1ec09 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -795,8 +795,8 @@  static void csi2_phy_init(struct cal_ctx *ctx)
 		ctx->csi2_port,
 		reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port)));
 
-	/* Dummy read to allow SCP to complete */
-	val = reg_read(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port));
+	/* Dummy read to allow SCP reset to complete */
+	reg_read(ctx->cc, CAL_CSI2_PHY_REG0);
 
 	/* 3.A. Program Phy Timing Parameters */
 	csi2_phy_config(ctx);