github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: mediatek: mt8365-dai-i2s: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

Browse Source 
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/87eczl8oxa.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2025-02-26 01:39:29 +00:00 committed by Mark Brown
parent db9912ce99
commit 9002421ebb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
View File

@ -313,7 +313,7 @@ static int mt8365_dai_set_config(struct mtk_base_afe *afe,
}
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
SND_SOC_DAIFMT_CBM_CFM) {
SND_SOC_DAIFMT_CBP_CFP) {
val |= AFE_I2S_CON_SRC_SLAVE;
val &= ~(u32)AFE_I2S_CON_FROM_IO_MUX;//from consys
}
@ -523,7 +523,7 @@ static int mt8365_dai_i2s_startup(struct snd_pcm_substream *substream,
bool i2s_in_slave =
(substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
SND_SOC_DAIFMT_CBM_CFM);
SND_SOC_DAIFMT_CBP_CFP);
mt8365_afe_enable_main_clk(afe);
@ -551,7 +551,7 @@ static void mt8365_dai_i2s_shutdown(struct snd_pcm_substream *substream,
bool i2s_in_slave =
(substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
SND_SOC_DAIFMT_CBM_CFM);
SND_SOC_DAIFMT_CBP_CFP);
if (be->prepared[substream->stream]) {
if (reset_i2s_out_change)
@ -613,7 +613,7 @@ static int mt8365_dai_i2s_prepare(struct snd_pcm_substream *substream,
if (apply_i2s_in_change) {
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
== SND_SOC_DAIFMT_CBM_CFM) {
== SND_SOC_DAIFMT_CBP_CFP) {
ret = mt8365_afe_set_2nd_i2s_asrc(afe, 32000, rate,
(unsigned int)bit_width,
0, 0, 1);
@ -659,7 +659,7 @@ static int mt8365_dai_i2s_prepare(struct snd_pcm_substream *substream,
mt8365_dai_set_enable(afe, i2s_data, true, true);
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
== SND_SOC_DAIFMT_CBM_CFM)
== SND_SOC_DAIFMT_CBP_CFP)
mt8365_afe_set_2nd_i2s_asrc_enable(afe, true);
be->prepared[SNDRV_PCM_STREAM_CAPTURE] = true;
@ -712,7 +712,7 @@ static int mt8365_afe_2nd_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
be->fmt_mode |= (fmt & SND_SOC_DAIFMT_INV_MASK);
if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM))
if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBP_CFP))
be->fmt_mode |= (fmt & SND_SOC_DAIFMT_MASTER_MASK);
return 0;