From: Michael Tretter <m.tretter@pengutronix.de>
To: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
Marek Vasut <marex@denx.de>
Cc: Rob Herring <robh+dt@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
p.zabel@pengutronix.de, Ian Arkver <ian.arkver.dev@gmail.com>,
kernel@pengutronix.de, Michael Tretter <m.tretter@pengutronix.de>,
Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH v9 1/3] media: imx6-mipi-csi2: use pre_streamon callback to set sensor into LP11
Date: Mon, 29 Nov 2021 12:27:06 +0100 [thread overview]
Message-ID: <20211129112708.3219754-2-m.tretter@pengutronix.de> (raw)
In-Reply-To: <20211129112708.3219754-1-m.tretter@pengutronix.de>
Step 5 expects that the sensor is in LP11 mode. Use the new
pre_streamon callback to signal the sensor that it should switch into
LP11.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changelog:
v9: none
v8: none
v7: none
v6: none
v5:
- ignore -ENOIOCTLCMD of pre_streamon for backwards compatibility
v4:
- new patch
---
drivers/staging/media/imx/imx6-mipi-csi2.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index a0941fc2907b..558b256ac935 100644
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -382,13 +382,17 @@ static int csi2_start(struct csi2_dev *csi2)
csi2_enable(csi2, true);
/* Step 5 */
+ ret = v4l2_subdev_call(csi2->src_sd, video, pre_streamon,
+ V4L2_SUBDEV_PRE_STREAMON_FL_MANUAL_LP);
+ if (ret && ret != -ENOIOCTLCMD)
+ goto err_assert_reset;
csi2_dphy_wait_stopstate(csi2, lanes);
/* Step 6 */
ret = v4l2_subdev_call(csi2->src_sd, video, s_stream, 1);
ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0;
if (ret)
- goto err_assert_reset;
+ goto err_stop_lp11;
/* Step 7 */
ret = csi2_dphy_wait_clock_lane(csi2);
@@ -399,6 +403,8 @@ static int csi2_start(struct csi2_dev *csi2)
err_stop_upstream:
v4l2_subdev_call(csi2->src_sd, video, s_stream, 0);
+err_stop_lp11:
+ v4l2_subdev_call(csi2->src_sd, video, post_streamoff);
err_assert_reset:
csi2_enable(csi2, false);
err_disable_clk:
@@ -410,6 +416,7 @@ static void csi2_stop(struct csi2_dev *csi2)
{
/* stop upstream */
v4l2_subdev_call(csi2->src_sd, video, s_stream, 0);
+ v4l2_subdev_call(csi2->src_sd, video, post_streamoff);
csi2_enable(csi2, false);
clk_disable_unprepare(csi2->pix_clk);
--
2.30.2
next prev parent reply other threads:[~2021-11-29 12:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-29 11:27 [PATCH v9 0/3] media: i2c: isl7998x: Add driver for Intersil ISL7998x Michael Tretter
2021-11-29 11:27 ` Michael Tretter [this message]
2021-11-29 11:27 ` [PATCH v9 2/3] media: dt-bindings: Add Intersil ISL79987 DT bindings Michael Tretter
2021-11-29 11:27 ` [PATCH v9 3/3] media: i2c: isl7998x: Add driver for Intersil ISL7998x Michael Tretter
2021-12-02 8:31 ` Sakari Ailus
2021-12-03 8:28 ` Michael Tretter
2021-12-14 10:14 ` Mauro Carvalho Chehab
2021-12-16 11:41 ` Michael Tretter
2021-12-16 11:57 ` Marek Vasut
2021-12-16 12:12 ` Mauro Carvalho Chehab
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=20211129112708.3219754-2-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=ian.arkver.dev@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=marex@denx.de \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.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;
as well as URLs for NNTP newsgroup(s).