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

[sfrench/cifs-2.6.git] / sound / soc / ti / davinci-i2s.c

diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
index 0363a088d2e00058d9f96bb62e4aad7b57742f5f..e6e77a5f3c1e7d3177cd4bd0a6375d0f2d84ca9c 100644 (file)
--- a/sound/soc/ti/davinci-i2s.c
+++ b/sound/soc/ti/davinci-i2s.c
@@ -230,15 +230,15 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 
        dev->fmt = fmt;
        /* set master/slave audio interface */
-       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:
                /* cpu is master */
                pcr = DAVINCI_MCBSP_PCR_FSXM |
                        DAVINCI_MCBSP_PCR_FSRM |
                        DAVINCI_MCBSP_PCR_CLKXM |
                        DAVINCI_MCBSP_PCR_CLKRM;
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_BC_FP:
                pcr = DAVINCI_MCBSP_PCR_FSRM | DAVINCI_MCBSP_PCR_FSXM;
                /*
                 * Selection of the clock input pin that is the
@@ -260,7 +260,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                }
 
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_BC_FC:
                /* codec is master */
                pcr = 0;
                break;
@@ -395,12 +395,12 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
                davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
        }
 
-       master = dev->fmt & SND_SOC_DAIFMT_MASTER_MASK;
+       master = dev->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK;
        fmt = params_format(params);
        mcbsp_word_length = asp_word_length[fmt];
 
        switch (master) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_BP_FP:
                freq = clk_get_rate(dev->clk);
                srgr = DAVINCI_MCBSP_SRGR_FSGM |
                       DAVINCI_MCBSP_SRGR_CLKSM;
@@ -426,7 +426,7 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
                clk_div &= 0xFF;
                srgr |= clk_div;
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_BC_FP:
                srgr = DAVINCI_MCBSP_SRGR_FSGM;
                clk_div = dev->clk_div - 1;
                srgr |= DAVINCI_MCBSP_SRGR_FWID(mcbsp_word_length * 8 - 1);
@@ -434,7 +434,7 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
                clk_div &= 0xFF;
                srgr |= clk_div;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_BC_FC:
                /* Clock and frame sync given from external sources */
                i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
                srgr = DAVINCI_MCBSP_SRGR_FSGM;
@@ -473,15 +473,15 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
                        fmt = double_fmt[fmt];
                }
                switch (master) {
-               case SND_SOC_DAIFMT_CBS_CFS:
-               case SND_SOC_DAIFMT_CBS_CFM:
+               case SND_SOC_DAIFMT_BP_FP:
+               case SND_SOC_DAIFMT_BP_FC:
                        rcr |= DAVINCI_MCBSP_RCR_RFRLEN2(0);
                        xcr |= DAVINCI_MCBSP_XCR_XFRLEN2(0);
                        rcr |= DAVINCI_MCBSP_RCR_RPHASE;
                        xcr |= DAVINCI_MCBSP_XCR_XPHASE;
                        break;
-               case SND_SOC_DAIFMT_CBM_CFM:
-               case SND_SOC_DAIFMT_CBM_CFS:
+               case SND_SOC_DAIFMT_BC_FC:
+               case SND_SOC_DAIFMT_BC_FP:
                        rcr |= DAVINCI_MCBSP_RCR_RFRLEN2(element_cnt - 1);
                        xcr |= DAVINCI_MCBSP_XCR_XFRLEN2(element_cnt - 1);
                        break;
@@ -492,13 +492,13 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
        mcbsp_word_length = asp_word_length[fmt];
 
        switch (master) {
-       case SND_SOC_DAIFMT_CBS_CFS:
-       case SND_SOC_DAIFMT_CBS_CFM:
+       case SND_SOC_DAIFMT_BP_FP:
+       case SND_SOC_DAIFMT_BP_FC:
                rcr |= DAVINCI_MCBSP_RCR_RFRLEN1(0);
                xcr |= DAVINCI_MCBSP_XCR_XFRLEN1(0);
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_BC_FC:
+       case SND_SOC_DAIFMT_BC_FP:
                rcr |= DAVINCI_MCBSP_RCR_RFRLEN1(element_cnt - 1);
                xcr |= DAVINCI_MCBSP_XCR_XFRLEN1(element_cnt - 1);
                break;
@@ -640,7 +640,8 @@ static struct snd_soc_dai_driver davinci_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver davinci_i2s_component = {
-       .name           = DRV_NAME,
+       .name                   = DRV_NAME,
+       .legacy_dai_naming      = 1,
 };
 
 static int davinci_i2s_probe(struct platform_device *pdev)