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

[sfrench/cifs-2.6.git] / sound / soc / au1x / psc-i2s.c

diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index b2b8896bb593c2b8bb8206e3e06e1d82e8750974..79b5ae4e494cb6410350cbc0e9331674193cbadc 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:
@@ -286,7 +286,8 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = {
 };
 
 static const struct snd_soc_component_driver au1xpsc_i2s_component = {
-       .name           = "au1xpsc-i2s",
+       .name                   = "au1xpsc-i2s",
+       .legacy_dai_naming      = 1,
 };
 
 static int au1xpsc_i2s_drvprobe(struct platform_device *pdev)