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 v5 06/14] media: cadence: csi2rx: Set the STOP bit when stopping a stream
Date: Fri, 24 Dec 2021 00:46:07 +0530 [thread overview]
Message-ID: <20211223191615.17803-7-p.yadav@ti.com> (raw)
In-Reply-To: <20211223191615.17803-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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes in v5:
- Change %d to %u
- Add Laurent's R-by.
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 baf8ec649a25..86546074c555 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)
@@ -312,12 +317,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%u\n", i);
clk_disable_unprepare(csi2rx->pixel_clk[i]);
}
--
2.33.1.835.ge9e5ba39a7
next prev parent reply other threads:[~2021-12-23 19:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-23 19:16 [PATCH v5 00/14] CSI2RX support on J721E Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 01/14] media: cadence: csi2rx: Unregister v4l2 async notifier Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 02/14] media: cadence: csi2rx: Cleanup media entity properly Pratyush Yadav
2021-12-30 4:23 ` Laurent Pinchart
2021-12-23 19:16 ` [PATCH v5 03/14] media: cadence: csi2rx: Add get_fmt and set_fmt pad ops Pratyush Yadav
2021-12-30 4:32 ` Laurent Pinchart
2022-01-04 6:21 ` Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 04/14] media: cadence: csi2rx: Add external DPHY support Pratyush Yadav
2021-12-30 4:43 ` Laurent Pinchart
2022-01-01 3:07 ` kernel test robot
2021-12-23 19:16 ` [PATCH v5 05/14] media: cadence: csi2rx: Soft reset the streams before starting capture Pratyush Yadav
2021-12-23 19:16 ` Pratyush Yadav [this message]
2021-12-23 19:16 ` [PATCH v5 07/14] media: cadence: csi2rx: Fix stream data configuration Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 08/14] media: cadence: csi2rx: Populate subdev devnode Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 09/14] media: cadence: csi2rx: Add link validation Pratyush Yadav
2021-12-30 4:47 ` Laurent Pinchart
2021-12-23 19:16 ` [PATCH v5 10/14] media: Re-structure TI platform drivers Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 11/14] media: ti: Add CSI2RX support for J721E Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 12/14] media: dt-bindings: Make sure items in data-lanes are unique Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 13/14] media: dt-bindings: Add DT bindings for TI J721E CSI2RX driver Pratyush Yadav
2021-12-23 19:16 ` [PATCH v5 14/14] media: dt-bindings: Convert Cadence CSI2RX binding to YAML 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=20211223191615.17803-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.