Skip to content

Commit 88768d6

Browse files
sandordevabelvesa
authored andcommitted
clk: imx95-blk-ctl: Rename lvds and displaymix csr blk
Rename i.MX95 lvds and displaymix csr blk drvdata in order to add support for i.MX943. Signed-off-by: Sandor Yu <[email protected]> Signed-off-by: Laurentiu Palcu <[email protected]> Reviewed-by: Abel Vesa <[email protected]> Signed-off-by: Peng Fan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abel Vesa <[email protected]>
1 parent b08217a commit 88768d6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

drivers/clk/imx/clk-imx95-blk-ctl.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static const struct imx95_blk_ctl_dev_data camblk_dev_data = {
156156
.clk_reg_offset = 0,
157157
};
158158

159-
static const struct imx95_blk_ctl_clk_dev_data lvds_clk_dev_data[] = {
159+
static const struct imx95_blk_ctl_clk_dev_data imx95_lvds_clk_dev_data[] = {
160160
[IMX95_CLK_DISPMIX_LVDS_PHY_DIV] = {
161161
.name = "ldb_phy_div",
162162
.parent_names = (const char *[]){ "ldbpll", },
@@ -213,21 +213,21 @@ static const struct imx95_blk_ctl_clk_dev_data lvds_clk_dev_data[] = {
213213
},
214214
};
215215

216-
static const struct imx95_blk_ctl_dev_data lvds_csr_dev_data = {
217-
.num_clks = ARRAY_SIZE(lvds_clk_dev_data),
218-
.clk_dev_data = lvds_clk_dev_data,
216+
static const struct imx95_blk_ctl_dev_data imx95_lvds_csr_dev_data = {
217+
.num_clks = ARRAY_SIZE(imx95_lvds_clk_dev_data),
218+
.clk_dev_data = imx95_lvds_clk_dev_data,
219219
.clk_reg_offset = 0,
220220
};
221221

222-
static const char * const disp_engine_parents[] = {
222+
static const char * const imx95_disp_engine_parents[] = {
223223
"videopll1", "dsi_pll", "ldb_pll_div7"
224224
};
225225

226-
static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
226+
static const struct imx95_blk_ctl_clk_dev_data imx95_dispmix_csr_clk_dev_data[] = {
227227
[IMX95_CLK_DISPMIX_ENG0_SEL] = {
228228
.name = "disp_engine0_sel",
229-
.parent_names = disp_engine_parents,
230-
.num_parents = ARRAY_SIZE(disp_engine_parents),
229+
.parent_names = imx95_disp_engine_parents,
230+
.num_parents = ARRAY_SIZE(imx95_disp_engine_parents),
231231
.reg = 0,
232232
.bit_idx = 0,
233233
.bit_width = 2,
@@ -236,8 +236,8 @@ static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
236236
},
237237
[IMX95_CLK_DISPMIX_ENG1_SEL] = {
238238
.name = "disp_engine1_sel",
239-
.parent_names = disp_engine_parents,
240-
.num_parents = ARRAY_SIZE(disp_engine_parents),
239+
.parent_names = imx95_disp_engine_parents,
240+
.num_parents = ARRAY_SIZE(imx95_disp_engine_parents),
241241
.reg = 0,
242242
.bit_idx = 2,
243243
.bit_width = 2,
@@ -246,9 +246,9 @@ static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = {
246246
}
247247
};
248248

249-
static const struct imx95_blk_ctl_dev_data dispmix_csr_dev_data = {
250-
.num_clks = ARRAY_SIZE(dispmix_csr_clk_dev_data),
251-
.clk_dev_data = dispmix_csr_clk_dev_data,
249+
static const struct imx95_blk_ctl_dev_data imx95_dispmix_csr_dev_data = {
250+
.num_clks = ARRAY_SIZE(imx95_dispmix_csr_clk_dev_data),
251+
.clk_dev_data = imx95_dispmix_csr_clk_dev_data,
252252
.clk_reg_offset = 0,
253253
};
254254

@@ -469,8 +469,8 @@ static const struct dev_pm_ops imx95_bc_pm_ops = {
469469
static const struct of_device_id imx95_bc_of_match[] = {
470470
{ .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data },
471471
{ .compatible = "nxp,imx95-display-master-csr", },
472-
{ .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data },
473-
{ .compatible = "nxp,imx95-display-csr", .data = &dispmix_csr_dev_data },
472+
{ .compatible = "nxp,imx95-display-csr", .data = &imx95_dispmix_csr_dev_data },
473+
{ .compatible = "nxp,imx95-lvds-csr", .data = &imx95_lvds_csr_dev_data },
474474
{ .compatible = "nxp,imx95-hsio-blk-ctl", .data = &hsio_blk_ctl_dev_data },
475475
{ .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data },
476476
{ .compatible = "nxp,imx95-netcmix-blk-ctrl", .data = &netcmix_dev_data},

0 commit comments

Comments
 (0)