From: Frank Li <Frank.Li@nxp.com>
To: Rui Miguel Silva <rmfrfs@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Martin Kepplinger <martink@posteo.de>,
Purism Kernel Team <kernel@puri.sm>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Eugen Hristev <eugen.hristev@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>, Peng Fan <peng.fan@nxp.com>,
Alice Yuan <alice.yuan@nxp.com>, Vinod Koul <vkoul@kernel.org>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Steve Longerbeam <slongerbeam@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-phy@lists.infradead.org, linux-staging@lists.linux.dev,
Frank Li <Frank.Li@nxp.com>
Subject: [PATCH v3 24/31] media: synopsys: csi2: Add need_dphy_reset in config
Date: Thu, 21 Aug 2025 16:15:59 -0400 [thread overview]
Message-ID: <20250821-95_cam-v3-24-c9286fbb34b9@nxp.com> (raw)
In-Reply-To: <20250821-95_cam-v3-0-c9286fbb34b9@nxp.com>
Add need_dphy_reset in config to indicate need keep dphy reset state during
config dphy because some SoC like i.MX93 need it.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/media/platform/synopsys/mipi-csi2.c | 45 +++++++++++++++++++++++++++++
include/media/dw-mipi-csi2.h | 1 +
2 files changed, 46 insertions(+)
diff --git a/drivers/media/platform/synopsys/mipi-csi2.c b/drivers/media/platform/synopsys/mipi-csi2.c
index d6eb666646b916c2609a279f8badc1e8af557121..632ae5fd7da7850374c79dcff63b6ee4aee7b611 100644
--- a/drivers/media/platform/synopsys/mipi-csi2.c
+++ b/drivers/media/platform/synopsys/mipi-csi2.c
@@ -447,6 +447,45 @@ static void dw_csi2_disable_irq(struct dw_mipi_csi2_dev *csi2)
dw_writel(csi2, 0, int_msk_ipi_fatal);
}
+static void dw_csi2_dphy_reset(struct dw_mipi_csi2_dev *csi2)
+{
+ u32 val;
+
+ /* Release synopsis DPHY test codes from reset */
+ dw_writel(csi2, 0, dphy_rstz);
+ dw_writel(csi2, 0, phy_shutdownz);
+
+ val = dw_readl(csi2, phy_tst_ctrl0);
+ val &= ~DPHY_TEST_CTRL0_TEST_CLR;
+ dw_writel(csi2, val, phy_tst_ctrl0);
+
+ /*
+ * ndelay is not necessary have MMIO operation, need dummy read to make
+ * sure above write reach target.
+ */
+ val = dw_readl(csi2, phy_tst_ctrl0);
+ /* Wait for at least 15ns */
+ ndelay(15);
+ val |= DPHY_TEST_CTRL0_TEST_CLR;
+ dw_writel(csi2, val, phy_tst_ctrl0);
+}
+
+static void dw_csi2_dphy_release_reset(struct dw_mipi_csi2_dev *csi2)
+{
+ /* Release PHY from reset */
+ dw_writel(csi2, 0x1, phy_shutdownz);
+ /*
+ * ndelay is not necessary have MMIO operation, need dummy read to make
+ * sure above write reach target.
+ */
+ dw_readl(csi2, phy_shutdownz);
+ ndelay(5);
+ dw_writel(csi2, 0x1, dphy_rstz);
+
+ dw_readl(csi2, dphy_rstz);
+ ndelay(5);
+}
+
static int csi2_start(struct dw_mipi_csi2_dev *csi2, int bpp)
{
unsigned int lanes;
@@ -460,6 +499,9 @@ static int csi2_start(struct dw_mipi_csi2_dev *csi2, int bpp)
if (ret)
goto err_phy_prep;
+ if (csi2->config->need_dphy_reset)
+ dw_csi2_dphy_reset(csi2);
+
/* setup the gasket */
if (csi2->config && csi2->config->gasket_init)
csi2->config->gasket_init(csi2);
@@ -482,6 +524,9 @@ static int csi2_start(struct dw_mipi_csi2_dev *csi2, int bpp)
if (ret)
goto err_phy_power_on;
+ if (csi2->config->need_dphy_reset)
+ dw_csi2_dphy_release_reset(csi2);
+
csi2_enable(csi2, true);
/* Step 5 */
diff --git a/include/media/dw-mipi-csi2.h b/include/media/dw-mipi-csi2.h
index 20ce6a21f0674cad54f01edb508dce14cd07a8dd..d1afd8c6d95457c28d7e1de6935908437372572d 100644
--- a/include/media/dw-mipi-csi2.h
+++ b/include/media/dw-mipi-csi2.h
@@ -28,6 +28,7 @@ struct dw_mipi_csi2_config {
u32 sink_pad_mask;
bool has_phy: 1;
bool has_irq: 1;
+ bool need_dphy_reset: 1;
};
struct dw_mipi_tstif {
--
2.34.1
next prev parent reply other threads:[~2025-08-21 20:18 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-21 20:15 [PATCH v3 00/31] media: add imx93 mipi/controller csi support Frank Li
2025-08-21 20:15 ` [PATCH v3 01/31] dt-bindings: media: add DW MIPI CSI-2 Host support Frank Li
2025-08-22 20:15 ` Rob Herring (Arm)
2025-08-21 20:15 ` [PATCH v3 02/31] media: v4l2-common: Add helper function v4l_get_required_align_by_bpp() Frank Li
2025-08-21 20:15 ` [PATCH v3 03/31] media: v4l2-common: Add helper function media_bus_fmt_to_csi2_(bpp|dt)() Frank Li
2025-08-21 20:15 ` [PATCH v3 04/31] media: staging: media: imx6-mipi-csi2: replace space with tab for alignment Frank Li
2025-08-21 20:15 ` [PATCH v3 05/31] media: staging: media: imx6-mipi-csi2: use devm_add_action_or_reset() to simplify code Frank Li
2025-08-21 20:15 ` [PATCH v3 06/31] media: staging: media: imx6-mipi-csi2: use devm_clk_bulk_get_all() to fetch clocks Frank Li
2025-08-21 20:15 ` [PATCH v3 07/31] media: staging: media: imx6-mipi-csi2: use devm_mutex_init() to simplify code Frank Li
2025-08-21 20:15 ` [PATCH v3 08/31] media: staging: media: imx6-mipi-csi2: use guard() " Frank Li
2025-08-21 20:15 ` [PATCH v3 09/31] media: staging: media: imx6-mipi-csi2: use register structure to match hardware Frank Li
2025-08-21 20:15 ` [PATCH v3 10/31] media: staging: media: imx6-mipi-csi2: use devm_platform_ioremap_resource() simplify code Frank Li
2025-08-21 20:15 ` [PATCH v3 11/31] media: staging: media: imx6-mipi-csi2: move probe part to imx6-csi2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 12/31] media: staging: media: imx6-mipi-csi2: move sd imx6's specific initialization into imx6-sci2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 13/31] media: staging: media: imx6-mipi-csi2: move csi2ipu_gasket_init() to imx6-csi2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 14/31] media: staging: media: imx6-mipi-csi2: move number pad macro define into imx6-csi2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 15/31] media: staging: media: imx6-mipi-csi2: move dphy init part to imx6-csi2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 16/31] media: staging: media: imx6-mipi-csi2: use runtime_pm frame to control clks Frank Li
2025-08-21 20:15 ` [PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c Frank Li
2025-08-21 20:15 ` [PATCH v3 18/31] media: synopsys: csi2: Remove deprecated s_stream and use v4l2_subdev_pad_ops Frank Li
2025-08-21 20:15 ` [PATCH v3 19/31] media: synopsys: csi2: Add phy interface support Frank Li
2025-08-21 20:15 ` [PATCH v3 20/31] media: synopsys: csi2: Add basic v150* version register Frank Li
2025-08-21 20:15 ` [PATCH v3 21/31] media: synopsys: csi2: Add irq support to record error count Frank Li
2025-08-21 20:15 ` [PATCH v3 22/31] media: synopsys: csi2: Handle alignment requirement for width Frank Li
2025-08-21 20:15 ` [PATCH v3 23/31] media: synopsys: csi2: Add register prefix to register field definitions Frank Li
2025-08-21 20:15 ` Frank Li [this message]
2025-08-21 20:16 ` [PATCH v3 25/31] media: synopsys: csi2: Add default simple dw_csi2_subdev_init_state Frank Li
2025-08-21 20:16 ` [PATCH v3 26/31] media: synopsys: csi2: Add v150 lane stop state register bit define Frank Li
2025-08-21 20:16 ` [PATCH v3 27/31] media: synopsys: csi2: use standard v4l2_subdev_get_fmt() function Frank Li
2025-08-21 20:16 ` [PATCH v3 28/31] media: synopsys: csi2: Add customize get_frame_desc() callback Frank Li
2025-08-21 20:16 ` [PATCH v3 29/31] media: synopsys: csi2: Add Image Pixel Interface (IPI) support for v150 Frank Li
2025-08-21 20:16 ` [PATCH v3 30/31] media: synopsys: csi2: Remove source pad connected check at dw_csi2_enable_streams() Frank Li
2025-08-21 20:16 ` [PATCH v3 31/31] media: synopsys: csi2: Add simple synopsys platform driver Frank Li
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=20250821-95_cam-v3-24-c9286fbb34b9@nxp.com \
--to=frank.li@nxp.com \
--cc=alice.yuan@nxp.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=eugen.hristev@linaro.org \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=kernel@puri.sm \
--cc=kishon@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=martink@posteo.de \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=peng.fan@nxp.com \
--cc=rmfrfs@gmail.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=slongerbeam@gmail.com \
--cc=vkoul@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).