Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd6646bc authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: Intel: Use .dai_fmt for setting Haswell BE format. 



Update the Haswell driver to use .dai_fmt in DAI link to set the
format.

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent f69f41e1

sound/soc/intel/haswell.c

+2 −8
Original line number Diff line number Diff line
@@ -69,14 +69,6 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	int ret;



	/* Set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set codec DAI configuration\n");

		return ret;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000,

		SND_SOC_CLOCK_IN);
@@ -188,6 +180,8 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { 
		.no_pcm = 1,

		.codec_name = "i2c-INT33CA:00",

		.codec_dai_name = "rt5640-aif1",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.be_hw_params_fixup = haswell_ssp0_fixup,