]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: fsl: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 26 Feb 2025 01:30:35 +0000 (01:30 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 3 Mar 2025 12:57:18 +0000 (12:57 +0000)
In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/871pvlh4qs.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/fsl-asoc-card.c

index 2bad9cb1daafb3cb8489d5eee92618956dd5b8e3..ab583b432c60b722938c2f2058c50991a6b50b39 100644 (file)
@@ -759,7 +759,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
        } else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) {
                codec_dai_name[0] = "tlv320dac31xx-hifi";
-               priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
+               priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;
                priv->dai_link[1].playback_only = 1;
                priv->dai_link[2].playback_only = 1;
                priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT;
@@ -818,7 +818,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                priv->codec_priv[0].mclk_id = NAU8822_CLK_MCLK;
                priv->codec_priv[0].fll_id = NAU8822_CLK_PLL;
                priv->codec_priv[0].pll_id = NAU8822_CLK_PLL;
-               priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
+               priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
                if (codec_dev[0])
                        priv->codec_priv[0].mclk = devm_clk_get(codec_dev[0], NULL);
        } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8904")) {