ASoC: meson: 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-15-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/aiu-encoder-i2s.c b/sound/soc/meson/aiu-encoder-i2s.c
index 67729de41a73ef5981a0bb757a71817cfd41fd17..0ab991230deec5053f158688d8004f6fe344bf5a 100644 (file)
--- a/sound/soc/meson/aiu-encoder-i2s.c
+++ b/sound/soc/meson/aiu-encoder-i2s.c
@@ -229,7 +229,7 @@ static int aiu_encoder_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        unsigned int skew;
 
        /* Only CPU Master / Codec Slave supported ATM */
-       if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
+       if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_BP_FP)
                return -EINVAL;
 
        if (inv == SND_SOC_DAIFMT_NB_IF ||
@@ -323,7 +323,7 @@ static void aiu_encoder_i2s_shutdown(struct snd_pcm_substream *substream,
 const struct snd_soc_dai_ops aiu_encoder_i2s_dai_ops = {
        .hw_params      = aiu_encoder_i2s_hw_params,
        .hw_free        = aiu_encoder_i2s_hw_free,
-       .set_fmt        = aiu_encoder_i2s_set_fmt,
+       .set_fmt_new    = aiu_encoder_i2s_set_fmt,
        .set_sysclk     = aiu_encoder_i2s_set_sysclk,
        .startup        = aiu_encoder_i2s_startup,
        .shutdown       = aiu_encoder_i2s_shutdown,

diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index e076ced30025741af2ad13d0574ba1ab15ff6777..ffdb12d0e01e3d6cdce8ee30d43a491304289b1b 100644 (file)
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -119,19 +119,19 @@ static int axg_tdm_iface_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
        struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai);
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_BP_FP:
                if (!iface->mclk) {
                        dev_err(dai->dev, "cpu clock master: mclk missing\n");
                        return -ENODEV;
                }
                break;
 
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_BC_FC:
                break;
 
-       case SND_SOC_DAIFMT_CBS_CFM:
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_BP_FC:
+       case SND_SOC_DAIFMT_BC_FP:
                dev_err(dai->dev, "only CBS_CFS and CBM_CFM are supported\n");
                fallthrough;
        default:
@@ -326,8 +326,8 @@ static int axg_tdm_iface_hw_params(struct snd_pcm_substream *substream,
        if (ret)
                return ret;
 
-       if ((iface->fmt & SND_SOC_DAIFMT_MASTER_MASK) ==
-           SND_SOC_DAIFMT_CBS_CFS) {
+       if ((iface->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) ==
+           SND_SOC_DAIFMT_BP_FP) {
                ret = axg_tdm_iface_set_sclk(dai, params);
                if (ret)
                        return ret;
@@ -394,7 +394,7 @@ static int axg_tdm_iface_probe_dai(struct snd_soc_dai *dai)
 
 static const struct snd_soc_dai_ops axg_tdm_iface_ops = {
        .set_sysclk     = axg_tdm_iface_set_sysclk,
-       .set_fmt        = axg_tdm_iface_set_fmt,
+       .set_fmt_new    = axg_tdm_iface_set_fmt,
        .startup        = axg_tdm_iface_startup,
        .hw_params      = axg_tdm_iface_hw_params,
        .prepare        = axg_tdm_iface_prepare,