Commit 70ac07bb authored by Timur Tabi's avatar Timur Tabi Committed by Mark Brown
Browse files

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: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
parent 588fb705

sound/soc/fsl/p1022_ds.c

+16 −8
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE