2024-02-16 10:11:02

by Paul Elder

Subject: [PATCH v12 12/12] media: rkisp1: Add match data for i.MX8MP ISP

Add match data to the rkisp1 driver to match the i.MX8MP ISP.

Signed-off-by: Paul Elder <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Tested-by: Alexander Stein <[email protected]>
Tested-by: Adam Ford <[email protected]>
Reviewed-by: Tomi Valkeinen <[email protected]>
---
Changes in v12:
- move out adding the version enum
---
.../platform/rockchip/rkisp1/rkisp1-dev.c | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index 54a62487a4e8..a6b47f0af467 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -533,6 +533,26 @@ static const struct rkisp1_info rk3399_isp_info = {
| RKISP1_FEATURE_DUAL_CROP,
};

+static const char * const imx8mp_isp_clks[] = {
+ "isp",
+ "hclk",
+ "aclk",
+};
+
+static const struct rkisp1_isr_data imx8mp_isp_isrs[] = {
+ { NULL, rkisp1_isr, BIT(RKISP1_IRQ_ISP) | BIT(RKISP1_IRQ_MI) },
+};
+
+static const struct rkisp1_info imx8mp_isp_info = {
+ .clks = imx8mp_isp_clks,
+ .clk_size = ARRAY_SIZE(imx8mp_isp_clks),
+ .isrs = imx8mp_isp_isrs,
+ .isr_size = ARRAY_SIZE(imx8mp_isp_isrs),
+ .isp_ver = RKISP1_V_IMX8MP,
+ .features = RKISP1_FEATURE_MAIN_STRIDE
+ | RKISP1_FEATURE_DMA_34BIT,
+};
+
static const struct of_device_id rkisp1_of_match[] = {
{
.compatible = "rockchip,px30-cif-isp",
@@ -542,6 +562,10 @@ static const struct of_device_id rkisp1_of_match[] = {
.compatible = "rockchip,rk3399-cif-isp",
.data = &rk3399_isp_info,
},
+ {
+ .compatible = "fsl,imx8mp-isp",
+ .data = &imx8mp_isp_info,
+ },
{},
};
MODULE_DEVICE_TABLE(of, rkisp1_of_match);
--
2.39.2

2024-02-18 20:03:44

by Laurent Pinchart

Subject: Re: [PATCH v12 12/12] media: rkisp1: Add match data for i.MX8MP ISP

Hi Paul,

Thank you for the patch.

On Fri, Feb 16, 2024 at 06:54:58PM +0900, Paul Elder wrote:
> Add match data to the rkisp1 driver to match the i.MX8MP ISP.
>
> Signed-off-by: Paul Elder <[email protected]>
> Reviewed-by: Rob Herring <[email protected]>
> Tested-by: Alexander Stein <[email protected]>
> Tested-by: Adam Ford <[email protected]>
> Reviewed-by: Tomi Valkeinen <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> Changes in v12:
> - move out adding the version enum
> ---
> .../platform/rockchip/rkisp1/rkisp1-dev.c | 24 +++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 54a62487a4e8..a6b47f0af467 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -533,6 +533,26 @@ static const struct rkisp1_info rk3399_isp_info = {
> | RKISP1_FEATURE_DUAL_CROP,
> };
>
> +static const char * const imx8mp_isp_clks[] = {
> + "isp",
> + "hclk",
> + "aclk",
> +};
> +
> +static const struct rkisp1_isr_data imx8mp_isp_isrs[] = {
> + { NULL, rkisp1_isr, BIT(RKISP1_IRQ_ISP) | BIT(RKISP1_IRQ_MI) },
> +};
> +
> +static const struct rkisp1_info imx8mp_isp_info = {
> + .clks = imx8mp_isp_clks,
> + .clk_size = ARRAY_SIZE(imx8mp_isp_clks),
> + .isrs = imx8mp_isp_isrs,
> + .isr_size = ARRAY_SIZE(imx8mp_isp_isrs),
> + .isp_ver = RKISP1_V_IMX8MP,
> + .features = RKISP1_FEATURE_MAIN_STRIDE
> + | RKISP1_FEATURE_DMA_34BIT,
> +};
> +
> static const struct of_device_id rkisp1_of_match[] = {
> {
> .compatible = "rockchip,px30-cif-isp",
> @@ -542,6 +562,10 @@ static const struct of_device_id rkisp1_of_match[] = {
> .compatible = "rockchip,rk3399-cif-isp",
> .data = &rk3399_isp_info,
> },
> + {
> + .compatible = "fsl,imx8mp-isp",
> + .data = &imx8mp_isp_info,
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, rkisp1_of_match);

--
Regards,

Laurent Pinchart