From: Pratyush Yadav <p.yadav@ti.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: "Pratyush Yadav" <p.yadav@ti.com>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Nikhil Devshatwar" <nikhil.nd@ti.com>,
"Tomi Valkeinen" <tomi.valkeinen@ideasonboard.com>,
"Vignesh Raghavendra" <vigneshr@ti.com>,
"Benoit Parrot" <bparrot@ti.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Subject: [PATCH v4 04/11] media: cadence: csi2rx: Set the STOP bit when stopping a stream
Date: Wed, 15 Sep 2021 17:32:33 +0530 [thread overview]
Message-ID: <20210915120240.21572-5-p.yadav@ti.com> (raw)
In-Reply-To: <20210915120240.21572-1-p.yadav@ti.com>
The stream stop procedure says that the STOP bit should be set when the
stream is to be stopped, and then the ready bit in stream status
register polled to make sure the STOP operation is finished.
Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
---
(no changes since v1)
drivers/media/platform/cadence/cdns-csi2rx.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index e05d76394cd6..3730e8beee48 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -8,6 +8,7 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_graph.h>
@@ -40,8 +41,12 @@
#define CSI2RX_STREAM_CTRL_REG(n) (CSI2RX_STREAM_BASE(n) + 0x000)
#define CSI2RX_STREAM_CTRL_SOFT_RST BIT(4)
+#define CSI2RX_STREAM_CTRL_STOP BIT(1)
#define CSI2RX_STREAM_CTRL_START BIT(0)
+#define CSI2RX_STREAM_STATUS_REG(n) (CSI2RX_STREAM_BASE(n) + 0x004)
+#define CSI2RX_STREAM_STATUS_RDY BIT(31)
+
#define CSI2RX_STREAM_DATA_CFG_REG(n) (CSI2RX_STREAM_BASE(n) + 0x008)
#define CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT BIT(31)
#define CSI2RX_STREAM_DATA_CFG_VC_SELECT(n) BIT((n) + 16)
@@ -321,12 +326,23 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
static void csi2rx_stop(struct csi2rx_priv *csi2rx)
{
unsigned int i;
+ u32 val;
+ int ret;
clk_prepare_enable(csi2rx->p_clk);
clk_disable_unprepare(csi2rx->sys_clk);
for (i = 0; i < csi2rx->max_streams; i++) {
- writel(0, csi2rx->base + CSI2RX_STREAM_CTRL_REG(i));
+ writel(CSI2RX_STREAM_CTRL_STOP,
+ csi2rx->base + CSI2RX_STREAM_CTRL_REG(i));
+
+ ret = readl_relaxed_poll_timeout(csi2rx->base +
+ CSI2RX_STREAM_STATUS_REG(i),
+ val,
+ (val & CSI2RX_STREAM_STATUS_RDY),
+ 10, 10000);
+ if (ret)
+ dev_warn(csi2rx->dev, "Failed to stop stream%d\n", i);
clk_disable_unprepare(csi2rx->pixel_clk[i]);
}
--
2.33.0
next prev parent reply other threads:[~2021-09-15 12:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 12:02 [PATCH v4 00/11] CSI2RX support on J721E Pratyush Yadav
2021-09-15 12:02 ` [PATCH v4 01/11] media: cadence: csi2rx: Unregister v4l2 async notifier Pratyush Yadav
2021-10-06 23:31 ` Laurent Pinchart
2021-10-07 12:19 ` Pratyush Yadav
2021-09-15 12:02 ` [PATCH v4 02/11] media: cadence: csi2rx: Add external DPHY support Pratyush Yadav
2021-10-06 20:19 ` Sakari Ailus
2021-10-06 21:01 ` Pratyush Yadav
2021-10-06 23:40 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 03/11] media: cadence: csi2rx: Soft reset the streams before starting capture Pratyush Yadav
2021-10-06 23:41 ` Laurent Pinchart
2021-09-15 12:02 ` Pratyush Yadav [this message]
2021-10-06 23:42 ` [PATCH v4 04/11] media: cadence: csi2rx: Set the STOP bit when stopping a stream Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 05/11] media: cadence: csi2rx: Fix stream data configuration Pratyush Yadav
2021-10-06 23:44 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 06/11] media: cadence: csi2rx: Populate subdev devnode Pratyush Yadav
2021-10-06 23:45 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 07/11] media: Re-structure TI platform drivers Pratyush Yadav
2021-10-06 23:46 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 08/11] media: ti: Add CSI2RX support for J721E Pratyush Yadav
2021-10-06 20:28 ` Sakari Ailus
2021-10-06 21:01 ` Pratyush Yadav
2021-10-06 21:08 ` Sakari Ailus
2021-09-15 12:02 ` [PATCH v4 09/11] media: dt-bindings: Make sure items in data-lanes are unique Pratyush Yadav
2021-09-21 21:31 ` Rob Herring
2021-10-06 23:47 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 10/11] media: dt-bindings: Add DT bindings for TI J721E CSI2RX driver Pratyush Yadav
2021-09-21 21:32 ` Rob Herring
2021-10-06 23:49 ` Laurent Pinchart
2021-09-15 12:02 ` [PATCH v4 11/11] media: dt-bindings: Convert Cadence CSI2RX binding to YAML Pratyush Yadav
2021-09-21 21:35 ` Rob Herring
2021-10-06 23:54 ` Laurent Pinchart
2021-10-07 12:16 ` Pratyush Yadav
2021-10-06 8:21 ` [PATCH v4 00/11] CSI2RX support on J721E Pratyush Yadav
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=20210915120240.21572-5-p.yadav@ti.com \
--to=p.yadav@ti.com \
--cc=bparrot@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=nikhil.nd@ti.com \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=vigneshr@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
all inboxes | Powered by JetHome®