Merge tag 'driver-core-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / sound / soc / codecs / max98390.c

diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index d1882cb..40fd6f3 100644 (file)
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -174,12 +174,12 @@ static int max98390_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 
        dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt);
 
-       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_CBC_CFC:
                mode = MAX98390_PCM_MASTER_MODE_SLAVE;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
-               max98390->master = true;
+       case SND_SOC_DAIFMT_CBP_CFP:
+               max98390->provider = true;
                mode = MAX98390_PCM_MASTER_MODE_MASTER;
                break;
        default:
@@ -265,7 +265,7 @@ static int max98390_set_clock(struct snd_soc_component *component,
                * snd_pcm_format_width(params_format(params));
        int value;
 
-       if (max98390->master) {
+       if (max98390->provider) {
                int i;
                /* match rate to closest value */
                for (i = 0; i < ARRAY_SIZE(rate_table); i++) {