]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: codecs: es8316: Fix HW rate calculation for 48Mhz MCLK
authorMarian Postevca <posteuca@mutex.one>
Fri, 27 Dec 2024 20:27:51 +0000 (22:27 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 7 Jan 2025 11:58:30 +0000 (11:58 +0000)
For 48Mhz MCLK systems the calculation of the HW rate is broken,
and will not produce even one sane rate. Since es83xx supports
the option to halve MCLK, calculate also rates with MCLK/2.

Signed-off-by: Marian Postevca <posteuca@mutex.one>
Link: https://patch.msgid.link/20241227202751.244954-1-posteuca@mutex.one
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/es8316.c

index 61729e5b50a8e49626415249835812f181a0d783..f508df01145bfbb20f01eb08ba8cd7df340b9049 100644 (file)
@@ -39,7 +39,9 @@ struct es8316_priv {
        struct snd_soc_jack *jack;
        int irq;
        unsigned int sysclk;
-       unsigned int allowed_rates[ARRAY_SIZE(supported_mclk_lrck_ratios)];
+       /* ES83xx supports halving the MCLK so it supports twice as many rates
+        */
+       unsigned int allowed_rates[ARRAY_SIZE(supported_mclk_lrck_ratios) * 2];
        struct snd_pcm_hw_constraint_list sysclk_constraints;
        bool jd_inverted;
 };
@@ -386,6 +388,12 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 
                if (freq % ratio == 0)
                        es8316->allowed_rates[count++] = freq / ratio;
+
+               /* We also check if the halved MCLK produces a valid rate
+                * since the codec supports halving the MCLK.
+                */
+               if ((freq / ratio) % 2 == 0)
+                       es8316->allowed_rates[count++] = freq / ratio / 2;
        }
 
        if (count) {