[PATCH v2 3/5] clk: imx95-blk-ctl: Rename lvds and displaymix csr blk

[Frank Li]

On Thu, Jul 03, 2025 at 11:40:22AM +0800, Peng Fan wrote:
> From: Sandor Yu <Sandor.yu at nxp.com>
>
> Rename i.MX95 lvds and displaymix csr blk drvdata in order to add
> support for i.MX943.
>
> Signed-off-by: Sandor Yu <Sandor.yu at nxp.com>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu at oss.nxp.com>
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  drivers/clk/imx/clk-imx95-blk-ctl.c | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c b/drivers/clk/imx/clk-imx95-blk-ctl.c
> index 86bdcd21753102b7d160288e7b69bf73da5a5706..828ee0a81ff62c6e4f61eef350b9073f19f5351f 100644
> --- a/drivers/clk/imx/clk-imx95-blk-ctl.c
> +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c
> @@ -156,7 +156,7 @@ static const struct imx95_blk_ctl_dev_data camblk_dev_data = {
>  	.clk_reg_offset = 0,
>  };
>
> -static const struct imx95_blk_ctl_clk_dev_data lvds_clk_dev_data[] = {
> +static const struct imx95_blk_ctl_clk_dev_data imx95_lvds_clk_dev_data[] = {
>  	[IMX95_CLK_DISPMIX_LVDS_PHY_DIV] = {
>  		.name = "ldb_phy_div",
>  		.parent_names = (const char *[]){ "ldbpll", },
> @@ -213,21 +213,21 @@ static const struct imx95_blk_ctl_clk_dev_data lvds_clk_dev_data[] = {
>  	},
>  };
>
> -static const struct imx95_blk_ctl_dev_data lvds_csr_dev_data = {
> -	.num_clks = ARRAY_SIZE(lvds_clk_dev_data),
> -	.clk_dev_data = lvds_clk_dev_data,
> +static const struct imx95_blk_ctl_dev_data imx95_lvds_csr_dev_data = {
> +	.num_clks = ARRAY_SIZE(imx95_lvds_clk_dev_data),
> +	.clk_dev_data = imx95_lvds_clk_dev_data,
>  	.clk_reg_offset = 0,
>  };
>
> -static const char * const disp_engine_parents[] = {
> +static const char * const imx95_disp_engine_parents[] = {
>  	"videopll1", "dsi_pll", "ldb_pll_div7"
>  };
>
> -static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
> +static const struct imx95_blk_ctl_clk_dev_data imx95_dispmix_csr_clk_dev_data[] = {
>  	[IMX95_CLK_DISPMIX_ENG0_SEL] = {
>  		.name = "disp_engine0_sel",
> -		.parent_names = disp_engine_parents,
> -		.num_parents = ARRAY_SIZE(disp_engine_parents),
> +		.parent_names = imx95_disp_engine_parents,
> +		.num_parents = ARRAY_SIZE(imx95_disp_engine_parents),
>  		.reg = 0,
>  		.bit_idx = 0,
>  		.bit_width = 2,
> @@ -236,8 +236,8 @@ static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
>  	},
>  	[IMX95_CLK_DISPMIX_ENG1_SEL] = {
>  		.name = "disp_engine1_sel",
> -		.parent_names = disp_engine_parents,
> -		.num_parents = ARRAY_SIZE(disp_engine_parents),
> +		.parent_names = imx95_disp_engine_parents,
> +		.num_parents = ARRAY_SIZE(imx95_disp_engine_parents),
>  		.reg = 0,
>  		.bit_idx = 2,
>  		.bit_width = 2,
> @@ -246,9 +246,9 @@ static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
>  	}
>  };
>
> -static const struct imx95_blk_ctl_dev_data dispmix_csr_dev_data = {
> -	.num_clks = ARRAY_SIZE(dispmix_csr_clk_dev_data),
> -	.clk_dev_data = dispmix_csr_clk_dev_data,
> +static const struct imx95_blk_ctl_dev_data imx95_dispmix_csr_dev_data = {
> +	.num_clks = ARRAY_SIZE(imx95_dispmix_csr_clk_dev_data),
> +	.clk_dev_data = imx95_dispmix_csr_clk_dev_data,
>  	.clk_reg_offset = 0,
>  };
>
> @@ -469,8 +469,8 @@ static const struct dev_pm_ops imx95_bc_pm_ops = {
>  static const struct of_device_id imx95_bc_of_match[] = {
>  	{ .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data },
>  	{ .compatible = "nxp,imx95-display-master-csr", },
> -	{ .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data },
> -	{ .compatible = "nxp,imx95-display-csr", .data = &dispmix_csr_dev_data },
> +	{ .compatible = "nxp,imx95-lvds-csr", .data = &imx95_lvds_csr_dev_data },
> +	{ .compatible = "nxp,imx95-display-csr", .data = &imx95_dispmix_csr_dev_data },

You touch this two lines, can you keep it as order

{ .compatible = "nxp,imx95-display-csr", .data = &imx95_dispmix_csr_dev_data },
{ .compatible = "nxp,imx95-lvds-csr", .data = &imx95_lvds_csr_dev_data },

Frank

>  	{ .compatible = "nxp,imx95-hsio-blk-ctl", .data = &hsio_blk_ctl_dev_data },
>  	{ .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data },
>  	{ .compatible = "nxp,imx95-netcmix-blk-ctrl", .data = &netcmix_dev_data},
>
> --
> 2.37.1
>