ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master

The WM8776 codec driver requires the machine driver to set one of the
SND_SOC_DAIFMT_CBx_xxx values.  The P1022DS machine driver should be setting
SND_SOC_DAIFMT_CBM_CFM, but since that value was zero, no one noticed.

Commit 75d9ac46 ("ASoC: Allow DAI formats to be specified in the
dai_link"), however, changed the value of SND_SOC_DAIFMT_CBM_CFM from zero
to a non-zero value, which means that it now needs to be specifically set
by the machine driver.

We also set SND_SOC_DAIFMT_NB_NF, for the same reason.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org

diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index b8898708347507e5d9052025922f935c26ac7a37..46623405a2ce29ea00ae80080a4c88edc0a9e37b 100644 (file)
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -395,7 +395,8 @@ static int p1022_ds_probe(struct platform_device *pdev)
        }
 
        if (strcasecmp(sprop, "i2s-slave") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_I2S;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM;
                mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;
 
@@ -412,31 +413,38 @@ static int p1022_ds_probe(struct platform_device *pdev)
                }
                mdata->clk_frequency = be32_to_cpup(iprop);
        } else if (strcasecmp(sprop, "i2s-master") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_I2S;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;
                mdata->codec_clk_direction = SND_SOC_CLOCK_IN;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;
        } else if (strcasecmp(sprop, "lj-slave") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_LEFT_J;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM;
                mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;
        } else if (strcasecmp(sprop, "lj-master") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_LEFT_J;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBS_CFS;
                mdata->codec_clk_direction = SND_SOC_CLOCK_IN;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;
        } else if (strcasecmp(sprop, "rj-slave") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_RIGHT_J;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBM_CFM;
                mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;
        } else if (strcasecmp(sprop, "rj-master") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_RIGHT_J;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBS_CFS;
                mdata->codec_clk_direction = SND_SOC_CLOCK_IN;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;
        } else if (strcasecmp(sprop, "ac97-slave") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_AC97;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBM_CFM;
                mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;
        } else if (strcasecmp(sprop, "ac97-master") == 0) {
-               mdata->dai_format = SND_SOC_DAIFMT_AC97;
+               mdata->dai_format = SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBS_CFS;
                mdata->codec_clk_direction = SND_SOC_CLOCK_IN;
                mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;
        } else {