[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250819-csi2_imx8mq-v4-1-c16b1d8f88a9@nxp.com>
Date: Tue, 19 Aug 2025 11:58:00 +0800
From: Guoniu Zhou <guoniu.zhou@....com>
To: Rui Miguel Silva <rmfrfs@...il.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Martin Kepplinger <martink@...teo.de>, Purism Kernel Team <kernel@...i.sm>,
Mauro Carvalho Chehab <mchehab@...nel.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>
Cc: linux-media@...r.kernel.org, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Frank Li <Frank.Li@....com>, Guoniu Zhou <guoniu.zhou@....com>
Subject: [PATCH v4 1/4] media: imx8mq-mipi-csi2: Remove width field in
csi2_pix_format
Simplify the code by using helper function media_bus_fmt_to_csi2_bpp()
to get width for supported format.
No functions changed.
Signed-off-by: Guoniu Zhou <guoniu.zhou@....com>
---
drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 29 +++++----------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index 3a4645f59a44028fdca82a4d8393e1a0a6ba88f0..85700655ecad334c61e9b5f9f073e10b6db2618f 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
@@ -25,6 +25,7 @@
#include <linux/reset.h>
#include <linux/spinlock.h>
+#include <media/mipi-csi2.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
#include <media/v4l2-fwnode.h>
@@ -138,7 +139,6 @@ struct csi_state {
struct csi2_pix_format {
u32 code;
- u8 width;
};
/* -----------------------------------------------------------------------------
@@ -262,70 +262,49 @@ static const struct csi2_pix_format imx8mq_mipi_csi_formats[] = {
/* RAW (Bayer and greyscale) formats. */
{
.code = MEDIA_BUS_FMT_SBGGR8_1X8,
- .width = 8,
}, {
.code = MEDIA_BUS_FMT_SGBRG8_1X8,
- .width = 8,
}, {
.code = MEDIA_BUS_FMT_SGRBG8_1X8,
- .width = 8,
}, {
.code = MEDIA_BUS_FMT_SRGGB8_1X8,
- .width = 8,
}, {
.code = MEDIA_BUS_FMT_Y8_1X8,
- .width = 8,
}, {
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
- .width = 10,
}, {
.code = MEDIA_BUS_FMT_SGBRG10_1X10,
- .width = 10,
}, {
.code = MEDIA_BUS_FMT_SGRBG10_1X10,
- .width = 10,
}, {
.code = MEDIA_BUS_FMT_SRGGB10_1X10,
- .width = 10,
}, {
.code = MEDIA_BUS_FMT_Y10_1X10,
- .width = 10,
}, {
.code = MEDIA_BUS_FMT_SBGGR12_1X12,
- .width = 12,
}, {
.code = MEDIA_BUS_FMT_SGBRG12_1X12,
- .width = 12,
}, {
.code = MEDIA_BUS_FMT_SGRBG12_1X12,
- .width = 12,
}, {
.code = MEDIA_BUS_FMT_SRGGB12_1X12,
- .width = 12,
}, {
.code = MEDIA_BUS_FMT_Y12_1X12,
- .width = 12,
}, {
.code = MEDIA_BUS_FMT_SBGGR14_1X14,
- .width = 14,
}, {
.code = MEDIA_BUS_FMT_SGBRG14_1X14,
- .width = 14,
}, {
.code = MEDIA_BUS_FMT_SGRBG14_1X14,
- .width = 14,
}, {
.code = MEDIA_BUS_FMT_SRGGB14_1X14,
- .width = 14,
},
/* YUV formats */
{
.code = MEDIA_BUS_FMT_YUYV8_1X16,
- .width = 16,
}, {
.code = MEDIA_BUS_FMT_UYVY8_1X16,
- .width = 16,
- }
+ },
};
static const struct csi2_pix_format *find_csi2_format(u32 code)
@@ -415,6 +394,7 @@ static int imx8mq_mipi_csi_calc_hs_settle(struct csi_state *state,
u32 min_ths_settle, max_ths_settle, ths_settle_ns, esc_clk_period_ns;
const struct v4l2_mbus_framefmt *fmt;
const struct csi2_pix_format *csi2_fmt;
+ u32 bpp;
src_pad = media_entity_remote_source_pad_unique(&sd_state->sd->entity);
if (IS_ERR(src_pad)) {
@@ -427,8 +407,9 @@ static int imx8mq_mipi_csi_calc_hs_settle(struct csi_state *state,
fmt = v4l2_subdev_state_get_format(sd_state, MIPI_CSI2_PAD_SINK);
csi2_fmt = find_csi2_format(fmt->code);
+ bpp = media_bus_fmt_to_csi2_bpp(csi2_fmt->code);
- link_freq = v4l2_get_link_freq(src_pad, csi2_fmt->width,
+ link_freq = v4l2_get_link_freq(src_pad, bpp,
state->bus.num_data_lanes * 2);
if (link_freq < 0) {
dev_err(state->dev, "Unable to obtain link frequency: %d\n",
--
2.34.1
Powered by blists - more mailing lists