ASoC: au1x: Convert to modern terminology for DAI clocking

As part of retiring the old macros defining the DAI clocking mode in the
DAI format update the au1x drivers to use the new style macros.

Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index 5f8baad..400eaf9 100644 (file)
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -117,7 +117,7 @@ static struct snd_soc_dai_link db1200_i2s_dai = {
        .name           = "WM8731",
        .stream_name    = "WM8731 PCM",
        .dai_fmt        = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
-                         SND_SOC_DAIFMT_CBM_CFM,
+                         SND_SOC_DAIFMT_CBP_CFP,
        .ops            = &db1200_i2s_wm8731_ops,
        SND_SOC_DAILINK_REG(db1200_i2s),
 };
@@ -138,7 +138,7 @@ static struct snd_soc_dai_link db1300_i2s_dai = {
        .name           = "WM8731",
        .stream_name    = "WM8731 PCM",
        .dai_fmt        = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
-                         SND_SOC_DAIFMT_CBM_CFM,
+                         SND_SOC_DAIFMT_CBP_CFP,
        .ops            = &db1200_i2s_wm8731_ops,
        SND_SOC_DAILINK_REG(db1300_i2s),
 };
@@ -159,7 +159,7 @@ static struct snd_soc_dai_link db1550_i2s_dai = {
        .name           = "WM8731",
        .stream_name    = "WM8731 PCM",
        .dai_fmt        = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
-                         SND_SOC_DAIFMT_CBM_CFM,
+                         SND_SOC_DAIFMT_CBP_CFP,
        .ops            = &db1200_i2s_wm8731_ops,
        SND_SOC_DAILINK_REG(db1550_i2s),
 };

diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c
index 65bd39f..740d4e0 100644 (file)
--- a/sound/soc/au1x/i2sc.c
+++ b/sound/soc/au1x/i2sc.c
@@ -119,9 +119,9 @@ static int au1xi2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                goto out;
        }
 
-       /* I2S controller only supports master */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:    /* CODEC slave */
+       /* I2S controller only supports provider */
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:    /* CODEC consumer */
                break;
        default:
                goto out;

diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 767ce95..b2b8896 100644 (file)
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -90,12 +90,12 @@ static int au1xpsc_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
                goto out;
        }
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:    /* CODEC master */
-               ct |= PSC_I2SCFG_MS;    /* PSC I2S slave mode */
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:    /* CODEC provider */
+               ct |= PSC_I2SCFG_MS;    /* PSC I2S consumer mode */
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:    /* CODEC slave */
-               ct &= ~PSC_I2SCFG_MS;   /* PSC I2S Master mode */
+       case SND_SOC_DAIFMT_CBC_CFC:    /* CODEC consumer */
+               ct &= ~PSC_I2SCFG_MS;   /* PSC I2S provider mode */
                break;
        default:
                goto out;