From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: <linux-media@vger.kernel.org>, Benoit Parrot <bparrot@ti.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v3 16/19] media: ti-vpe: cal: move code to separate functions
Date: Wed, 25 Mar 2020 14:15:07 +0200 [thread overview]
Message-ID: <20200325121510.25923-17-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <20200325121510.25923-1-tomi.valkeinen@ti.com>
To make csi2_wait_for_phy() more readable, move code to separate
functions.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
---
drivers/media/platform/ti-vpe/cal.c | 37 +++++++++++++++++++----------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 67954754ffff..e5a319f1fe26 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -823,20 +823,10 @@ static void csi2_phy_init(struct cal_ctx *ctx)
csi2_cio_power(ctx, true);
}
-static void csi2_wait_for_phy(struct cal_ctx *ctx)
+static void csi2_wait_complexio_reset(struct cal_ctx *ctx)
{
int i;
- /* Steps
- * 2. Wait for completion of reset
- * Note if the external sensor is not sending byte clock,
- * the reset will timeout
- * 4.Force FORCERXMODE
- * G. Wait for all enabled lane to reach stop state
- * H. Disable pull down using pad control
- */
-
- /* 2. Wait for reset completion */
for (i = 0; i < 250; i++) {
if (reg_read_field(ctx->dev,
CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
@@ -851,7 +841,12 @@ static void csi2_wait_for_phy(struct cal_ctx *ctx)
CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETCOMPLETED)
ctx_err(ctx, "Timeout waiting for Complex IO reset done\n");
- /* 4. G. Wait for all enabled lane to reach stop state */
+}
+
+static void csi2_wait_stop_state(struct cal_ctx *ctx)
+{
+ int i;
+
for (i = 0; i < 10; i++) {
if (reg_read_field(ctx->dev,
CAL_CSI2_TIMING(ctx->csi2_port),
@@ -863,6 +858,24 @@ static void csi2_wait_for_phy(struct cal_ctx *ctx)
if (reg_read_field(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port),
CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK) != 0)
ctx_err(ctx, "Timeout waiting for stop state\n");
+}
+
+static void csi2_wait_for_phy(struct cal_ctx *ctx)
+{
+ /* Steps
+ * 2. Wait for completion of reset
+ * Note if the external sensor is not sending byte clock,
+ * the reset will timeout
+ * 4.Force FORCERXMODE
+ * G. Wait for all enabled lane to reach stop state
+ * H. Disable pull down using pad control
+ */
+
+ /* 2. Wait for reset completion */
+ csi2_wait_complexio_reset(ctx);
+
+ /* 4. G. Wait for all enabled lane to reach stop state */
+ csi2_wait_stop_state(ctx);
ctx_dbg(1, ctx, "CSI2_%d_REG1 = 0x%08x (Bit(31,28) should be set!)\n",
(ctx->csi2_port - 1), reg_read(ctx->cc, CAL_CSI2_PHY_REG1));
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2020-03-25 12:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 12:14 [PATCH v3 00/19] CAL fixes and improvements Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 01/19] media: ti-vpe: cal: fix DMA memory corruption Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 02/19] media: ti-vpe: cal: improve enable_irqs Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 03/19] media: ti-vpe: cal: fix use of wrong macro Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 04/19] media: ti-vpe: cal: use runtime_resume for errata handling Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 05/19] media: ti-vpe: cal: drop cal_runtime_get/put Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 06/19] media: ti-vpe: cal: catch error irqs and print errors Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 07/19] media: ti-vpe: cal: print errors on timeouts Tomi Valkeinen
2020-03-25 12:14 ` [PATCH v3 08/19] media: ti-vpe: cal: simplify irq handling Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 09/19] media: ti-vpe: cal: remove useless CAL_GEN_* macros Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 10/19] media: ti-vpe: cal: remove useless IRQ defines Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 11/19] media: ti-vpe: cal: use reg_write_field Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 12/19] media: ti-vpe: cal: cleanup CIO power enable/disable Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 13/19] media: ti-vpe: cal: fix dummy read to phy Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 14/19] media: ti-vpe: cal: program number of lines properly Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 15/19] media: ti-vpe: cal: set DMA max seg size Tomi Valkeinen
2020-03-25 12:15 ` Tomi Valkeinen [this message]
2020-03-25 12:15 ` [PATCH v3 17/19] media: ti-vpe: cal: improve wait for CIO resetdone Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 18/19] media: ti-vpe: cal: improve wait for stop-state Tomi Valkeinen
2020-03-25 12:15 ` [PATCH v3 19/19] media: ti-vpe: cal: fix stop state timeout Tomi Valkeinen
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=20200325121510.25923-17-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=bparrot@ti.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).