ASoC: mediatek: Update to use set_fmt_new callback

As part of updating the core to directly tell drivers if they are clock
provider or consumer update these CPU side drivers to use the new direct
callback.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-14-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
index c02c10da360049a6b31a29203357147900075cb0..5f7c9516dfa1815b8a6093289b4470e6d2a20c69 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
@@ -2172,11 +2172,11 @@ static int mtk_dai_etdm_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                return -EINVAL;
        }
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_BC_FC:
                etdm_data->slave_mode = true;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_BP_FP:
                etdm_data->slave_mode = false;
                break;
        default:
@@ -2346,7 +2346,7 @@ static const struct snd_soc_dai_ops mtk_dai_etdm_ops = {
        .hw_params = mtk_dai_etdm_hw_params,
        .trigger = mtk_dai_etdm_trigger,
        .set_sysclk = mtk_dai_etdm_set_sysclk,
-       .set_fmt = mtk_dai_etdm_set_fmt,
+       .set_fmt_new = mtk_dai_etdm_set_fmt,
        .set_tdm_slot = mtk_dai_etdm_set_tdm_slot,
 };
 
@@ -2356,7 +2356,7 @@ static const struct snd_soc_dai_ops mtk_dai_hdmitx_dptx_ops = {
        .hw_params      = mtk_dai_hdmitx_dptx_hw_params,
        .trigger        = mtk_dai_hdmitx_dptx_trigger,
        .set_sysclk     = mtk_dai_hdmitx_dptx_set_sysclk,
-       .set_fmt        = mtk_dai_etdm_set_fmt,
+       .set_fmt_new    = mtk_dai_etdm_set_fmt,
 };
 
 /* dai driver */

diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
index 12644ded83d593363d2a4720527afd3f9c4bb6c7..37a8968ac21dc1fecef5f2ca950ef6761f6721fd 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
@@ -266,11 +266,11 @@ static int mtk_dai_pcm_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                return -EINVAL;
        }
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_BC_FC:
                pcmif_priv->slave_mode = 1;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_BP_FP:
                pcmif_priv->slave_mode = 0;
                break;
        default:
@@ -282,7 +282,7 @@ static int mtk_dai_pcm_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 
 static const struct snd_soc_dai_ops mtk_dai_pcm_ops = {
        .prepare        = mtk_dai_pcm_prepare,
-       .set_fmt        = mtk_dai_pcm_set_fmt,
+       .set_fmt_new    = mtk_dai_pcm_set_fmt,
 };
 
 /* dai driver */