Commit 5ccf442e authored by Brian Masney's avatar Brian Masney Committed by Raphael Gallais-Pou
Browse files

drm/stm/dw_mipi_dsi-stm: convert from round_rate() to determine_rate()



The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Acked-by: default avatarRaphael Gallais-Pou <raphael.gallais-pou@foss.st.com>
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
Acked-by: default avatarYannick Fertre <yannick.fertre@foss.st.com>
Link: https://lore.kernel.org/r/20250811-drm-clk-round-rate-v2-6-4a91ccf239cf@redhat.com


Signed-off-by: default avatarRaphael Gallais-Pou <raphael.gallais-pou@foss.st.com>
parent b1a122f4
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ static unsigned long dw_mipi_dsi_clk_recalc_rate(struct clk_hw *hw,
	return (unsigned long)pll_out_khz * 1000;
}

static long dw_mipi_dsi_clk_round_rate(struct clk_hw *hw, unsigned long rate,
				       unsigned long *parent_rate)
static int dw_mipi_dsi_clk_determine_rate(struct clk_hw *hw,
					  struct clk_rate_request *req)
{
	struct dw_mipi_dsi_stm *dsi = clk_to_dw_mipi_dsi_stm(hw);
	unsigned int idf, ndiv, odf, pll_in_khz, pll_out_khz;
@@ -283,14 +283,14 @@ static long dw_mipi_dsi_clk_round_rate(struct clk_hw *hw, unsigned long rate,

	DRM_DEBUG_DRIVER("\n");

	pll_in_khz = (unsigned int)(*parent_rate / 1000);
	pll_in_khz = (unsigned int)(req->best_parent_rate / 1000);

	/* Compute best pll parameters */
	idf = 0;
	ndiv = 0;
	odf = 0;

	ret = dsi_pll_get_params(dsi, pll_in_khz, rate / 1000,
	ret = dsi_pll_get_params(dsi, pll_in_khz, req->rate / 1000,
				 &idf, &ndiv, &odf);
	if (ret)
		DRM_WARN("Warning dsi_pll_get_params(): bad params\n");
@@ -298,7 +298,9 @@ static long dw_mipi_dsi_clk_round_rate(struct clk_hw *hw, unsigned long rate,
	/* Get the adjusted pll out value */
	pll_out_khz = dsi_pll_get_clkout_khz(pll_in_khz, idf, ndiv, odf);

	return pll_out_khz * 1000;
	req->rate = pll_out_khz * 1000;

	return 0;
}

static int dw_mipi_dsi_clk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -351,7 +353,7 @@ static const struct clk_ops dw_mipi_dsi_stm_clk_ops = {
	.disable = dw_mipi_dsi_clk_disable,
	.is_enabled = dw_mipi_dsi_clk_is_enabled,
	.recalc_rate = dw_mipi_dsi_clk_recalc_rate,
	.round_rate = dw_mipi_dsi_clk_round_rate,
	.determine_rate = dw_mipi_dsi_clk_determine_rate,
	.set_rate = dw_mipi_dsi_clk_set_rate,
};