]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: imx-card: Fix DSD/PDM mclk frequency
authorShengjiu Wang <shengjiu.wang@nxp.com>
Wed, 6 Jul 2022 09:42:55 +0000 (17:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:42:03 +0000 (14:42 +0200)
[ Upstream commit c0fabd12a8570cb932f13d9388f3d887ad44369b ]

The DSD/PDM rate not only DSD64/128/256/512, which are the
multiple rate of 44.1kHz,  but also support the multiple
rate of 8kHz, so can't force all mclk frequency to be
22579200Hz, need to assign the frequency according to
rate.

Fixes: aa736700f42f ("ASoC: imx-card: Add imx-card machine driver")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1657100575-8261-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/fsl/imx-card.c

index 6f8efd838fcc87ced7a7758f7955b52de7bc911f..c0eb218a254bd7bb11d6aaff629217812c561e46 100644 (file)
@@ -17,6 +17,9 @@
 
 #include "fsl_sai.h"
 
+#define IMX_CARD_MCLK_22P5792MHZ  22579200
+#define IMX_CARD_MCLK_24P576MHZ   24576000
+
 enum codec_type {
        CODEC_DUMMY = 0,
        CODEC_AK5558 = 1,
@@ -353,9 +356,14 @@ static int imx_aif_hw_params(struct snd_pcm_substream *substream,
                mclk_freq = akcodec_get_mclk_rate(substream, params, slots, slot_width);
        else
                mclk_freq = params_rate(params) * slots * slot_width;
-       /* Use the maximum freq from DSD512 (512*44100 = 22579200) */
-       if (format_is_dsd(params))
-               mclk_freq = 22579200;
+
+       if (format_is_dsd(params)) {
+               /* Use the maximum freq from DSD512 (512*44100 = 22579200) */
+               if (!(params_rate(params) % 11025))
+                       mclk_freq = IMX_CARD_MCLK_22P5792MHZ;
+               else
+                       mclk_freq = IMX_CARD_MCLK_24P576MHZ;
+       }
 
        ret = snd_soc_dai_set_sysclk(cpu_dai, link_data->cpu_sysclk_id, mclk_freq,
                                     SND_SOC_CLOCK_OUT);