[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <aJtsearbkc52vzAV@lizhi-Precision-Tower-5810>
Date: Tue, 12 Aug 2025 12:31:53 -0400
From: Frank Li <Frank.li@....com>
To: guoniu.zhou@....nxp.com
Cc: linux-media@...r.kernel.org, devicetree@...r.kernel.org,
imx@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, rmfrfs@...il.com,
laurent.pinchart@...asonboard.com, martink@...teo.de,
kernel@...i.sm, mchehab@...nel.org, robh@...nel.org,
krzk+dt@...nel.org, conor+dt@...nel.org, shawnguo@...nel.org,
s.hauer@...gutronix.de, kernel@...gutronix.de, festevam@...il.com
Subject: Re: [PATCH 3/5] media: imx8mq-mipi-csi2: Use devm_clk_bulk_get_all()
to fetch clocks
On Tue, Aug 12, 2025 at 04:19:24PM +0800, guoniu.zhou@....nxp.com wrote:
> From: Guoniu Zhou <guoniu.zhou@....com>
>
> Use devm_clk_bulk_get_all() helper to simplify clock handle code.
>
> No functional changes intended.
>
> Signed-off-by: Guoniu Zhou <guoniu.zhou@....com>
Reviewed-by: Frank Li <Frank.Li@....com>
> ---
> drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 52 ++++++-------------
> 1 file changed, 15 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
> index ed6578f7f0f9..be07ff27071f 100644
> --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
> +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
> @@ -72,21 +72,6 @@ enum {
> ST_SUSPENDED = 4,
> };
>
> -enum imx8mq_mipi_csi_clk {
> - CSI2_CLK_CORE,
> - CSI2_CLK_ESC,
> - CSI2_CLK_UI,
> - CSI2_NUM_CLKS,
> -};
> -
> -static const char * const imx8mq_mipi_csi_clk_id[CSI2_NUM_CLKS] = {
> - [CSI2_CLK_CORE] = "core",
> - [CSI2_CLK_ESC] = "esc",
> - [CSI2_CLK_UI] = "ui",
> -};
> -
> -#define CSI2_NUM_CLKS ARRAY_SIZE(imx8mq_mipi_csi_clk_id)
> -
> struct imx8mq_plat_data {
> int (*enable)(struct csi_state *state, u32 hs_settle);
> void (*disable)(struct csi_state *state);
> @@ -112,7 +97,8 @@ struct csi_state {
> struct device *dev;
> const struct imx8mq_plat_data *pdata;
> void __iomem *regs;
> - struct clk_bulk_data clks[CSI2_NUM_CLKS];
> + struct clk_bulk_data *clks;
> + int num_clks;
> struct reset_control *rst;
> struct regulator *mipi_phy_regulator;
>
> @@ -417,24 +403,16 @@ static void imx8mq_mipi_csi_set_params(struct csi_state *state)
> CSI2RX_SEND_LEVEL);
> }
>
> -static int imx8mq_mipi_csi_clk_enable(struct csi_state *state)
> -{
> - return clk_bulk_prepare_enable(CSI2_NUM_CLKS, state->clks);
> -}
> -
> -static void imx8mq_mipi_csi_clk_disable(struct csi_state *state)
> +static struct clk *find_esc_clk(struct csi_state *state)
> {
> - clk_bulk_disable_unprepare(CSI2_NUM_CLKS, state->clks);
> -}
> -
> -static int imx8mq_mipi_csi_clk_get(struct csi_state *state)
> -{
> - unsigned int i;
> + int i;
>
> - for (i = 0; i < CSI2_NUM_CLKS; i++)
> - state->clks[i].id = imx8mq_mipi_csi_clk_id[i];
> + for (i = 0; i < state->num_clks; i++) {
> + if (!strcmp(state->clks[i].id, "esc"))
> + return state->clks[i].clk;
> + }
>
> - return devm_clk_bulk_get(state->dev, CSI2_NUM_CLKS, state->clks);
> + return NULL;
> }
>
> static int imx8mq_mipi_csi_calc_hs_settle(struct csi_state *state,
> @@ -489,7 +467,7 @@ static int imx8mq_mipi_csi_calc_hs_settle(struct csi_state *state,
> * documentation recommends picking a value away from the boundaries.
> * Let's pick the average.
> */
> - esc_clk_rate = clk_get_rate(state->clks[CSI2_CLK_ESC].clk);
> + esc_clk_rate = clk_get_rate(find_esc_clk(state));
> if (!esc_clk_rate) {
> dev_err(state->dev, "Could not get esc clock rate.\n");
> return -EINVAL;
> @@ -848,7 +826,7 @@ static void imx8mq_mipi_csi_pm_suspend(struct device *dev)
>
> if (state->state & ST_POWERED) {
> imx8mq_mipi_csi_stop_stream(state);
> - imx8mq_mipi_csi_clk_disable(state);
> + clk_bulk_disable_unprepare(state->num_clks, state->clks);
> state->state &= ~ST_POWERED;
> }
>
> @@ -866,7 +844,7 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)
>
> if (!(state->state & ST_POWERED)) {
> state->state |= ST_POWERED;
> - ret = imx8mq_mipi_csi_clk_enable(state);
> + ret = clk_bulk_prepare_enable(state->num_clks, state->clks);
> }
> if (state->state & ST_STREAMING) {
> sd_state = v4l2_subdev_lock_and_get_active_state(sd);
> @@ -1092,9 +1070,9 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev)
> if (IS_ERR(state->regs))
> return PTR_ERR(state->regs);
>
> - ret = imx8mq_mipi_csi_clk_get(state);
> - if (ret < 0)
> - return ret;
> + state->num_clks = devm_clk_bulk_get_all(dev, &state->clks);
> + if (state->num_clks < 0)
> + return dev_err_probe(dev, state->num_clks, "Failed to get clocks\n");
>
> platform_set_drvdata(pdev, &state->sd);
>
> --
> 2.34.1
>
Powered by blists - more mailing lists