Commit 87063dfc authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Use dai_fmt in poodle machine driver

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fe366d06
...@@ -121,18 +121,6 @@ static int poodle_hw_params(struct snd_pcm_substream *substream, ...@@ -121,18 +121,6 @@ static int poodle_hw_params(struct snd_pcm_substream *substream,
break; break;
} }
/* 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)
return ret;
/* set cpu DAI configuration */
ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
if (ret < 0)
return ret;
/* set the codec system clock for DAC and ADC */ /* set the codec system clock for DAC and ADC */
ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, clk, ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, clk,
SND_SOC_CLOCK_IN); SND_SOC_CLOCK_IN);
...@@ -263,6 +251,8 @@ static struct snd_soc_dai_link poodle_dai = { ...@@ -263,6 +251,8 @@ static struct snd_soc_dai_link poodle_dai = {
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm8731.0-001b", .codec_name = "wm8731.0-001b",
.init = poodle_wm8731_init, .init = poodle_wm8731_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
.ops = &poodle_ops, .ops = &poodle_ops,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment