From: Brian Masney Date: Thu, 6 Nov 2025 23:40:43 +0000 (-0500) Subject: pmdomain: mediatek: convert from clk round_rate() to determine_rate() X-Git-Tag: v6.19-rc1~145^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ed617a62fe076bbfe700c8289fc2118d724821;p=thirdparty%2Fkernel%2Flinux.git pmdomain: mediatek: convert from clk round_rate() to determine_rate() The round_rate() clk ops is deprecated in the clk framework in favor of the determine_rate() clk ops, so let's convert this driver so that round_rate() can be removed from the clk core. Signed-off-by: Brian Masney Reviewed-by: Nicolas Frattaroli Signed-off-by: Ulf Hansson --- diff --git a/drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c b/drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c index af20111067c02..9bad577b3ae4b 100644 --- a/drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c +++ b/drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c @@ -309,11 +309,11 @@ static unsigned long mtk_mfg_recalc_rate_gpu(struct clk_hw *hw, return readl(mfg->shared_mem + GF_REG_FREQ_OUT_GPU) * HZ_PER_KHZ; } -static long mtk_mfg_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int mtk_mfg_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { /* - * The round_rate callback needs to be implemented to avoid returning + * The determine_rate callback needs to be implemented to avoid returning * the current clock frequency, rather than something even remotely * close to the frequency that was asked for. * @@ -325,7 +325,7 @@ static long mtk_mfg_round_rate(struct clk_hw *hw, unsigned long rate, * high current frequency, breaking the powersave governor in the process. */ - return rate; + return 0; } static unsigned long mtk_mfg_recalc_rate_stack(struct clk_hw *hw, @@ -338,12 +338,12 @@ static unsigned long mtk_mfg_recalc_rate_stack(struct clk_hw *hw, static const struct clk_ops mtk_mfg_clk_gpu_ops = { .recalc_rate = mtk_mfg_recalc_rate_gpu, - .round_rate = mtk_mfg_round_rate, + .determine_rate = mtk_mfg_determine_rate, }; static const struct clk_ops mtk_mfg_clk_stack_ops = { .recalc_rate = mtk_mfg_recalc_rate_stack, - .round_rate = mtk_mfg_round_rate, + .determine_rate = mtk_mfg_determine_rate, }; static const struct clk_init_data mtk_mfg_clk_gpu_init = {