linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: Rui Miguel Silva <rmfrfs@gmail.com>,
	Steve Longerbeam <slongerbeam@gmail.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Ezequiel Garcia <ezequiel@collabora.com>,
	Fabio Estevam <festevam@gmail.com>
Subject: [PATCH v2.1 70/77] media: imx: imx7_mipi_csis: Calculate Ths_settle from source lane rate
Date: Mon,  1 Mar 2021 18:40:19 +0200	[thread overview]
Message-ID: <20210301164019.13031-1-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20210215042741.28850-71-laurent.pinchart@ideasonboard.com>

The Ths_settle timing parameter depends solely on the lane data rate of
the source. Calculate it at runtime instead of requiring it to be
specified in the device tree.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v2:

- Don't print hs_settle at probe time
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 48 ++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index 333ab3966b5b..e1728240b494 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -24,6 +24,7 @@
 #include <linux/reset.h>
 #include <linux/spinlock.h>
 
+#include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-fwnode.h>
 #include <media/v4l2-mc.h>
@@ -482,6 +483,39 @@ static void __mipi_csis_set_format(struct csi_state *state)
 	mipi_csis_write(state, MIPI_CSIS_ISPRESOL_CH0, val);
 }
 
+static int mipi_csis_calculate_params(struct csi_state *state)
+{
+	s64 link_freq;
+	u32 lane_rate;
+
+	/* Calculate the line rate from the pixel rate. */
+	link_freq = v4l2_get_link_freq(state->src_sd->ctrl_handler,
+				       state->csis_fmt->width,
+				       state->bus.num_data_lanes * 2);
+	if (link_freq < 0) {
+		dev_err(state->dev, "Unable to obtain link frequency: %d\n",
+			(int)link_freq);
+		return link_freq;
+	}
+
+	lane_rate = link_freq * 2;
+
+	if (lane_rate < 80000000 || lane_rate > 1500000000) {
+		dev_dbg(state->dev, "Out-of-bound lane rate %u\n", lane_rate);
+		return -EINVAL;
+	}
+
+	/*
+	 * The HSSETTLE counter value is document in a table, but can also
+	 * easily be calculated.
+	 */
+	state->hs_settle = (lane_rate - 5000000) / 45000000;
+	dev_dbg(state->dev, "lane rate %u, Ths_settle %u\n",
+		lane_rate, state->hs_settle);
+
+	return 0;
+}
+
 static void mipi_csis_set_params(struct csi_state *state)
 {
 	int lanes = state->bus.num_data_lanes;
@@ -608,9 +642,13 @@ static void mipi_csis_log_counters(struct csi_state *state, bool non_errors)
 static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable)
 {
 	struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
-	int ret = 0;
+	int ret;
 
 	if (enable) {
+		ret = mipi_csis_calculate_params(state);
+		if (ret < 0)
+			return ret;
+
 		mipi_csis_clear_counters(state);
 		ret = pm_runtime_get_sync(&state->pdev->dev);
 		if (ret < 0) {
@@ -943,9 +981,6 @@ static int mipi_csis_parse_dt(struct platform_device *pdev,
 	if (IS_ERR(state->mrst))
 		return PTR_ERR(state->mrst);
 
-	/* Get MIPI CSI-2 bus configuration from the endpoint node. */
-	of_property_read_u32(node, "fsl,csis-hs-settle", &state->hs_settle);
-
 	return 0;
 }
 
@@ -1143,9 +1178,8 @@ static int mipi_csis_probe(struct platform_device *pdev)
 			goto unregister_all;
 	}
 
-	dev_info(&pdev->dev, "lanes: %d, hs_settle: %d, freq: %u\n",
-		 state->bus.num_data_lanes, state->hs_settle,
-		 state->clk_frequency);
+	dev_info(&pdev->dev, "lanes: %d, freq: %u\n",
+		 state->bus.num_data_lanes, state->clk_frequency);
 
 	return 0;
 
-- 
Regards,

Laurent Pinchart


  reply	other threads:[~2021-03-01 16:47 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-15  4:26 [PATCH v2 00/77] media: imx: Miscellaneous fixes and cleanups for i.MX7 Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 01/77] media: imx: Drop dependency on I2C Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 02/77] media: imx: Move dependency on VIDEO_DEV to common Kconfig symbol Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 03/77] media: imx: Drop manual dependency on VIDEO_IMX_MEDIA Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 04/77] media: imx: Compile imx6-media-objs only for CONFIG_VIDEO_IMX_CSI Laurent Pinchart
2021-02-26 15:45   ` Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 05/77] media: imx: Set default sizes through macros in all drivers Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 06/77] media: imx: utils: Add ability to filter pixel formats by mbus code Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 07/77] media: imx: capture: Use dev_* instead of v4l2_* to log messages Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 08/77] media: imx: capture: Use device name to construct bus_info Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 09/77] media: imx: capture: Remove forward declaration of capture_qops Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 10/77] media: imx: capture: Handle errors from v4l2_fh_open() Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 11/77] media: imx: capture: Clean up capture_priv structure Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 12/77] media: imx: capture: Remove capture_priv stop field Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 13/77] media: imx: capture: Move queue and ctrl handler init to init function Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 14/77] media: imx: capture: Initialize video_device programmatically Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 15/77] media: imx: capture: Register the video device after completing init Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 16/77] media: imx: capture: Store v4l2_pix_format in imx_media_video_dev Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 17/77] media: imx: capture: Move default format init to a separate function Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 18/77] media: imx: capture: Rename querycap handler to capture_querycap Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 19/77] media: imx: capture: Rename ioctl operations with legacy prefix Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 20/77] media: imx: capture: Add a mechanism to disable control inheritance Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 21/77] media: imx: capture: Remove unneeded variable in __capture_legacy_try_fmt Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 22/77] media: imx: capture: Pass v4l2_pix_format to __capture_legacy_try_fmt() Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 23/77] media: imx: capture: Return -EPIPE from __capture_legacy_try_fmt() Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 24/77] media: imx: capture: Extract format lookup from __capture_legacy_try_fmt Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 25/77] media: imx: capture: Simplify capture_validate_fmt() implementation Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 26/77] media: imx: capture: Simplify __capture_legacy_try_fmt() Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 27/77] media: imx: capture: Decouple video node from source with MC-centric API Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 28/77] media: imx: capture: Expose V4L2_CAP_IO_MC for the " Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 29/77] media: imx: imx7-media-csi: Disable legacy video node API Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 30/77] media: imx: capture: Support creating immutable link to capture device Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 31/77] media: imx: imx7-media-csi: Remove control handler Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 32/77] media: imx: imx7-media-csi: Move (de)init from link setup to .s_stream() Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 33/77] media: imx: imx7-media-csi: Create immutable link to capture device Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 34/77] media: imx: imx7-media-csi: Replace CSICR*_RESET_VAL with values Laurent Pinchart
2021-02-15  4:26 ` [PATCH v2 35/77] media: imx: imx7-media-csi: Tidy up register fields macros Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 36/77] media: imx: imx7-media-csi: Reorganize code in sections Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 37/77] media: imx: imx7-media-csi: Validate capture format in .link_validate() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 38/77] media: imx: imx7-media-csi: Fix source type identification Laurent Pinchart
2021-03-01  9:30   ` Rui Miguel Silva
2021-02-15  4:27 ` [PATCH v2 39/77] media: imx: imx7-media-csi: Don't lock access to is_csi2 Laurent Pinchart
2021-03-01  9:31   ` Rui Miguel Silva
2021-02-15  4:27 ` [PATCH v2 40/77] media: imx: imx7-media-csi: Rename imx7_csi_dma_start() to *_setup() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 41/77] media: imx: imx7-media-csi: Split imx7_csi_dma_stop() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 42/77] media: imx: imx7-media-csi: Move CSI configuration before source start Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 43/77] media: imx: imx7-media-csi: Merge streaming_start() with csi_enable() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 44/77] media: imx: imx7-media-csi: Merge hw_reset() with init_interface() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 45/77] media: imx: imx7-media-csi: Set the MIPI data type based on the bus code Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 46/77] media: imx: imx7-media-csi: Don't set the buffer stride when disabling Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 47/77] media: imx: imx7-media-csi: Merge all config in imx7_csi_configure() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 48/77] media: imx: imx7-media-csi: Clear all configurable CSICR18 fields Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 49/77] media: imx: imx7-media-csi: Set RFF burst type in imx7_csi_configure() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 50/77] media: imx: imx7-media-csi: Simplify imx7_csi_rx_fifo_clear() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 51/77] media: imx: imx7-media-csi: Don't double-enable the CSI Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 52/77] media: imx: imx7-media-csi: Don't double-enable the RxFIFO Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 53/77] media: imx: imx7-media-csi: Remove double reflash of DMA controller Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 54/77] media: imx: imx7-media-csi: Don't enable SOF and EOF interrupts Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 55/77] media: imx: imx7_media-csi: Add support for additional Bayer patterns Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 56/77] media: v4l2-mc: Add link flags to v4l2_create_fwnode_links_to_pad() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 57/77] media: imx: imx7_media-csi: Create immutable link to source device Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 58/77] dt-bindings: media: nxp,imx7-mipi-csi2: Drop the reset-names property Laurent Pinchart
2021-03-05 21:41   ` Rob Herring
2021-02-15  4:27 ` [PATCH v2 59/77] dt-bindings: media: nxp,imx7-mipi-csi2: Drop fsl,csis-hs-settle property Laurent Pinchart
2021-03-05 21:42   ` Rob Herring
2021-02-15  4:27 ` [PATCH v2 60/77] dt-bindings: media: nxp,imx7-mipi-csi2: Indent example with 4 spaces Laurent Pinchart
2021-03-01  9:33   ` Rui Miguel Silva
2021-03-05 21:42   ` Rob Herring
2021-02-15  4:27 ` [PATCH v2 61/77] dt-bindings: media: nxp,imx7-mipi-csi2: Expand descriptions Laurent Pinchart
2021-03-01  9:35   ` Rui Miguel Silva
2021-03-05 21:43   ` Rob Herring
2021-02-15  4:27 ` [PATCH v2 62/77] media: imx: imx7_mipi_csis: Acquire reset control without naming it Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 63/77] media: imx: imx7_mipi_csis: Fix input size alignment Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 64/77] media: imx: imx7_mipi_csis: Make source .s_power() optional Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 65/77] media: imx: imx7_mipi_csis: Avoid double get of wrap clock Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 66/77] media: imx: imx7_mipi_csis: Drop 10-bit YUV support Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 67/77] media: imx: imx7_mipi_csis: Fix UYVY8 media bus format Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 68/77] media: imx: imx7_mipi_csis: Inline mipi_csis_set_hsync_settle() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 69/77] media: imx: imx7_mipi_csis: Move link setup check out of locked section Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 70/77] media: imx: imx7_mipi_csis: Calculate Ths_settle from source lane rate Laurent Pinchart
2021-03-01 16:40   ` Laurent Pinchart [this message]
2021-02-15  4:27 ` [PATCH v2 71/77] media: imx: imx7_mipi_csis: Turn register access macros into functions Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 72/77] media: imx: imx7_mipi_csis: Fully initialize MIPI_CSIS_DPHYCTRL register Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 73/77] media: imx: imx7_mipi_csis: Define macros for DPHY_BCTRL_L fields Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 74/77] media: imx: imx7_mipi_csis: Make ISP registers macros take channel ID Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 75/77] media: imx: imx7_mipi_csis: Rename register macros to match datasheet Laurent Pinchart
2021-03-01 16:41   ` [PATCH v2.1 " Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 76/77] media: imx: imx7_mipi_csis: Use register macros in mipi_csis_dump_regs() Laurent Pinchart
2021-02-15  4:27 ` [PATCH v2 77/77] media: imx: imx7_mipi_csis: Print shadow registers " Laurent Pinchart
2021-03-16 11:56 ` [PATCH] imx7-media-csi: csi2 only Martin Kepplinger
2021-03-16 18:05   ` Laurent Pinchart
2021-03-17 10:08     ` Martin Kepplinger
2021-03-17 10:19       ` Laurent Pinchart
2021-03-28 14:25         ` Martin Kepplinger
2021-03-28 16:43           ` Laurent Pinchart
2021-03-17 18:04 ` [PATCH v2 00/77] media: imx: Miscellaneous fixes and cleanups for i.MX7 Frieder Schrempf
2021-03-19  1:27   ` Laurent Pinchart
2021-04-15  9:00     ` Frieder Schrempf
2021-04-15 16:04       ` Frieder Schrempf
2021-04-26  8:06         ` Frieder Schrempf

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=20210301164019.13031-1-laurent.pinchart@ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=ezequiel@collabora.com \
    --cc=festevam@gmail.com \
    --cc=linux-media@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=rmfrfs@gmail.com \
    --cc=slongerbeam@gmail.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).