ASoC: ep93xx: Convert to modern clocking terminology

As part of the effort to remove our old APIs based on outdated terminology
update the EP93xx drivers to use modern terminology.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210916143828.36215-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c
index 7b6cdc9..3852902 100644 (file)
--- a/sound/soc/cirrus/edb93xx.c
+++ b/sound/soc/cirrus/edb93xx.c
@@ -60,7 +60,7 @@ static struct snd_soc_dai_link edb93xx_dai = {
        .name           = "CS4271",
        .stream_name    = "CS4271 HiFi",
        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                         SND_SOC_DAIFMT_CBS_CFS,
+                         SND_SOC_DAIFMT_CBC_CFC,
        .ops            = &edb93xx_ops,
        SND_SOC_DAILINK_REG(hifi),
 };

diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 0d26550..06c315a 100644 (file)
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -245,14 +245,14 @@ static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                return -EINVAL;
        }
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
-               /* CPU is master */
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
+               /* CPU is provider */
                clk_cfg |= EP93XX_I2S_CLKCFG_MASTER;
                break;
 
-       case SND_SOC_DAIFMT_CBM_CFM:
-               /* Codec is master */
+       case SND_SOC_DAIFMT_CBP_CFP:
+               /* Codec is provider */
                clk_cfg &= ~EP93XX_I2S_CLKCFG_MASTER;
                break;
 

diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c
index c4b1129..a286f5b 100644 (file)
--- a/sound/soc/cirrus/snappercl15.c
+++ b/sound/soc/cirrus/snappercl15.c
@@ -70,7 +70,7 @@ static struct snd_soc_dai_link snappercl15_dai = {
        .name           = "tlv320aic23",
        .stream_name    = "AIC23",
        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                         SND_SOC_DAIFMT_CBS_CFS,
+                         SND_SOC_DAIFMT_CBC_CFC,
        .ops            = &snappercl15_ops,
        SND_SOC_DAILINK_REG(aic23),
 };