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

diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c
index 740d4e052e4df93075f523c46f9a4fcdad7295cc..72f16b7fda3e9d8a1509ad08652670e1af1c41fe 100644 (file)
--- a/sound/soc/au1x/i2sc.c
+++ b/sound/soc/au1x/i2sc.c
@@ -121,7 +121,7 @@ static int au1xi2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 
        /* I2S controller only supports provider */
        switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
-       case SND_SOC_DAIFMT_CBC_CFC:    /* CODEC consumer */
+       case SND_SOC_DAIFMT_BP_FP:      /* CODEC consumer */
                break;
        default:
                goto out;
@@ -206,7 +206,7 @@ static const struct snd_soc_dai_ops au1xi2s_dai_ops = {
        .startup        = au1xi2s_startup,
        .trigger        = au1xi2s_trigger,
        .hw_params      = au1xi2s_hw_params,
-       .set_fmt        = au1xi2s_set_fmt,
+       .set_fmt_new    = au1xi2s_set_fmt,
 };
 
 static struct snd_soc_dai_driver au1xi2s_dai_driver = {

diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index b2b8896bb593c2b8bb8206e3e06e1d82e8750974..d82c1353f2f0957a1aeb68e02c8fbf659abd2303 100644 (file)
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -91,10 +91,10 @@ static int au1xpsc_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
        }
 
        switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
-       case SND_SOC_DAIFMT_CBP_CFP:    /* CODEC provider */
+       case SND_SOC_DAIFMT_BC_FC:      /* CODEC provider */
                ct |= PSC_I2SCFG_MS;    /* PSC I2S consumer mode */
                break;
-       case SND_SOC_DAIFMT_CBC_CFC:    /* CODEC consumer */
+       case SND_SOC_DAIFMT_BP_FP:      /* CODEC consumer */
                ct &= ~PSC_I2SCFG_MS;   /* PSC I2S provider mode */
                break;
        default:
@@ -266,7 +266,7 @@ static const struct snd_soc_dai_ops au1xpsc_i2s_dai_ops = {
        .startup        = au1xpsc_i2s_startup,
        .trigger        = au1xpsc_i2s_trigger,
        .hw_params      = au1xpsc_i2s_hw_params,
-       .set_fmt        = au1xpsc_i2s_set_fmt,
+       .set_fmt_new    = au1xpsc_i2s_set_fmt,
 };
 
 static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = {