Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / mxs / mxs-saif.c

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 7afe1a1acc568ee69112cb9da94c23226edd0a1c..ac761d3a01c05a657dcbf1bde9549ac4c94f4dbb 100644 (file)
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -358,8 +358,8 @@ static int mxs_saif_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
         * Saif internally could be slave when working on EXTMASTER mode.
         * We just hide this to machine driver.
         */
-       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 (saif->id == saif->master_id)
                        scr &= ~BM_SAIF_CTRL_SLAVE_MODE;
                else
@@ -663,7 +663,8 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
 };
 
 static const struct snd_soc_component_driver mxs_saif_component = {
-       .name           = "mxs-saif",
+       .name                   = "mxs-saif",
+       .legacy_dai_naming      = 1,
 };
 
 static irqreturn_t mxs_saif_irq(int irq, void *dev_id)