diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-03-06 14:56:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-07 10:51:05 +0800 |
| commit | dd6646bcfa9c811518bfcdbd13e4f73b749646bb (patch) | |
| tree | 919d7ab1a6d6c2b70f063ede0b73a600811a2f29 /sound | |
| parent | f69f41e1a2568f2ebdcf021fe216c1e9ba24cc1f (diff) | |
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: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/haswell.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index 0d61197661d8..54345a2a7386 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -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, |