ASoC: tlv320aic32x4: div: Switch to determine_rate

The tlv320aic32x4 divider clocks implements a mux with a set_parent
hook, but doesn't provide a determine_rate implementation.

This is a bit odd, since set_parent() is there to, as its name implies,
change the parent of a clock. However, the most likely candidate to
trigger that parent change is a call to clk_set_rate(), with
determine_rate() figuring out which parent is the best suited for a
given rate.

The other trigger would be a call to clk_set_parent(), but it's far less
used, and it doesn't look like there's any obvious user for that clock.

So, the set_parent hook is effectively unused, possibly because of an
oversight. However, it could also be an explicit decision by the
original author to avoid any reparenting but through an explicit call to
clk_set_parent().

The driver does implement round_rate() though, which means that we can
change the rate of the clock, but we will never get to change the
parent.

However, It's hard to tell whether it's been done on purpose or not.

Since we'll start mandating a determine_rate() implementation, let's
convert the round_rate() implementation to a determine_rate(), which
will also make the current behavior explicit. And if it was an
oversight, the clock behaviour can be adjusted later on.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20221018-clk-range-checks-fixes-v4-67-971d5077e7d2@cerno.tech
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic32x4-clk.c b/sound/soc/codecs/tlv320aic32x4-clk.c
index e2de4617ab09173e437903fa652fd5ecbe1d0808..a7ec501b4c697b0e22d50d3be505903263716c0d 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4-clk.c
+++ b/sound/soc/codecs/tlv320aic32x4-clk.c
@@ -332,16 +332,17 @@ static int clk_aic32x4_div_set_rate(struct clk_hw *hw, unsigned long rate,
                                AIC32X4_DIV_MASK, divisor);
 }
 
-static long clk_aic32x4_div_round_rate(struct clk_hw *hw, unsigned long rate,
-                               unsigned long *parent_rate)
+static int clk_aic32x4_div_determine_rate(struct clk_hw *hw,
+                                         struct clk_rate_request *req)
 {
        unsigned long divisor;
 
-       divisor = DIV_ROUND_UP(*parent_rate, rate);
+       divisor = DIV_ROUND_UP(req->best_parent_rate, req->rate);
        if (divisor > 128)
                return -EINVAL;
 
-       return DIV_ROUND_UP(*parent_rate, divisor);
+       req->rate = DIV_ROUND_UP(req->best_parent_rate, divisor);
+       return 0;
 }
 
 static unsigned long clk_aic32x4_div_recalc_rate(struct clk_hw *hw,
@@ -360,7 +361,7 @@ static const struct clk_ops aic32x4_div_ops = {
        .prepare = clk_aic32x4_div_prepare,
        .unprepare = clk_aic32x4_div_unprepare,
        .set_rate = clk_aic32x4_div_set_rate,
-       .round_rate = clk_aic32x4_div_round_rate,
+       .determine_rate = clk_aic32x4_div_determine_rate,
        .recalc_rate = clk_aic32x4_div_recalc_rate,
 };
 
@@ -388,7 +389,7 @@ static const struct clk_ops aic32x4_bdiv_ops = {
        .set_parent = clk_aic32x4_bdiv_set_parent,
        .get_parent = clk_aic32x4_bdiv_get_parent,
        .set_rate = clk_aic32x4_div_set_rate,
-       .round_rate = clk_aic32x4_div_round_rate,
+       .determine_rate = clk_aic32x4_div_determine_rate,
        .recalc_rate = clk_aic32x4_div_recalc_rate,
 };