[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250421213201.GQ17813@pendragon.ideasonboard.com>
Date: Tue, 22 Apr 2025 00:32:01 +0300
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: Frank Li <Frank.Li@....com>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
Rui Miguel Silva <rmfrfs@...il.com>,
Martin Kepplinger <martink@...teo.de>,
Purism Kernel Team <kernel@...i.sm>, linux-media@...r.kernel.org,
devicetree@...r.kernel.org, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Robert Chiras <robert.chiras@....com>,
"Guoniu.zhou" <guoniu.zhou@....com>
Subject: Re: [PATCH v4 07/13] media: imx8-isi: Add support for i.MX8QM and
i.MX8QXP
Hi Frank,
Thank you for the patch.
On Tue, Apr 08, 2025 at 05:53:05PM -0400, Frank Li wrote:
> From: Robert Chiras <robert.chiras@....com>
>
> Add compatibles and platform data for i.MX8QM and i.MX8QXP platforms.
> i.MX8QM's IER register layout is difference with i.MX8QXP.
>
> Signed-off-by: Robert Chiras <robert.chiras@....com>
> Signed-off-by: Frank Li <Frank.Li@....com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> ---
> Change from v3 to v4
> - fix i.MX8QMP ier register layout
> - Remove clk-names array
> - Change 8QXP channel number to 6
>
> change from v2 to v3
> - none
>
> change from v1 to v2
> - remove intenal review tags
> ---
> .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 43 +++++++++++++++++++++-
> .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 2 +
> 2 files changed, 43 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> index 398cc03443be3..568d7b24466aa 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> @@ -246,7 +246,7 @@ static void mxc_isi_v4l2_cleanup(struct mxc_isi_dev *isi)
>
> /* Panic will assert when the buffers are 50% full */
>
> -/* For i.MX8QXP C0 and i.MX8MN ISI IER version */
> +/* For i.MX8MN ISI IER version */
> static const struct mxc_isi_ier_reg mxc_imx8_isi_ier_v1 = {
> .oflw_y_buf_en = { .mask = BIT(19) },
> .oflw_u_buf_en = { .mask = BIT(21) },
> @@ -257,7 +257,7 @@ static const struct mxc_isi_ier_reg mxc_imx8_isi_ier_v1 = {
> .panic_v_buf_en = { .mask = BIT(24) },
> };
>
> -/* For i.MX8MP ISI IER version */
> +/* For i.MX8QXP C0 and i.MX8MP ISI IER version */
> static const struct mxc_isi_ier_reg mxc_imx8_isi_ier_v2 = {
> .oflw_y_buf_en = { .mask = BIT(18) },
> .oflw_u_buf_en = { .mask = BIT(20) },
> @@ -268,6 +268,21 @@ static const struct mxc_isi_ier_reg mxc_imx8_isi_ier_v2 = {
> .panic_v_buf_en = { .mask = BIT(23) },
> };
>
> +/* For i.MX8QM ISI IER version */
> +static const struct mxc_isi_ier_reg mxc_imx8_isi_ier_qm = {
> + .oflw_y_buf_en = { .mask = BIT(16) },
> + .oflw_u_buf_en = { .mask = BIT(19) },
> + .oflw_v_buf_en = { .mask = BIT(22) },
> +
> + .excs_oflw_y_buf_en = { .mask = BIT(17) },
> + .excs_oflw_u_buf_en = { .mask = BIT(20) },
> + .excs_oflw_v_buf_en = { .mask = BIT(23) },
> +
> + .panic_y_buf_en = { .mask = BIT(18) },
> + .panic_u_buf_en = { .mask = BIT(21) },
> + .panic_v_buf_en = { .mask = BIT(24) },
> +};
> +
> /* Panic will assert when the buffers are 50% full */
> static const struct mxc_isi_set_thd mxc_imx8_isi_thd_v1 = {
> .panic_set_thd_y = { .mask = 0x0000f, .offset = 0, .threshold = 0x7 },
> @@ -322,6 +337,28 @@ static const struct mxc_isi_plat_data mxc_imx93_data = {
> .has_36bit_dma = false,
> };
>
> +static const struct mxc_isi_plat_data mxc_imx8qm_data = {
> + .model = MXC_ISI_IMX8QM,
> + .num_ports = 5,
> + .num_channels = 8,
> + .reg_offset = 0x10000,
> + .ier_reg = &mxc_imx8_isi_ier_qm,
> + .set_thd = &mxc_imx8_isi_thd_v1,
> + .buf_active_reverse = true,
> + .has_36bit_dma = false,
> +};
> +
> +static const struct mxc_isi_plat_data mxc_imx8qxp_data = {
> + .model = MXC_ISI_IMX8QXP,
> + .num_ports = 5,
> + .num_channels = 6,
> + .reg_offset = 0x10000,
> + .ier_reg = &mxc_imx8_isi_ier_v2,
> + .set_thd = &mxc_imx8_isi_thd_v1,
> + .buf_active_reverse = true,
> + .has_36bit_dma = false,
> +};
> +
> /* -----------------------------------------------------------------------------
> * Power management
> */
> @@ -497,6 +534,8 @@ static void mxc_isi_remove(struct platform_device *pdev)
> static const struct of_device_id mxc_isi_of_match[] = {
> { .compatible = "fsl,imx8mn-isi", .data = &mxc_imx8mn_data },
> { .compatible = "fsl,imx8mp-isi", .data = &mxc_imx8mp_data },
> + { .compatible = "fsl,imx8qm-isi", .data = &mxc_imx8qm_data },
> + { .compatible = "fsl,imx8qxp-isi", .data = &mxc_imx8qxp_data },
> { .compatible = "fsl,imx8ulp-isi", .data = &mxc_imx8ulp_data },
> { .compatible = "fsl,imx93-isi", .data = &mxc_imx93_data },
> { /* sentinel */ },
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> index bd3cfe5fbe063..206995bedca4a 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> @@ -157,6 +157,8 @@ struct mxc_gasket_ops {
> enum model {
> MXC_ISI_IMX8MN,
> MXC_ISI_IMX8MP,
> + MXC_ISI_IMX8QM,
> + MXC_ISI_IMX8QXP,
> MXC_ISI_IMX8ULP,
> MXC_ISI_IMX93,
> };
--
Regards,
Laurent Pinchart
Powered by blists - more mailing lists