diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 02:20:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-30 03:00:30 +0100 |
| commit | 87063dfcea80316ff4647b9906d146b5c7969766 (patch) | |
| tree | 3e127903806c0d97421ee603483bea60b67fcfb7 /sound/soc/pxa | |
| parent | ASoC: Convert poodle to table based DAPM and control init (diff) | |
| download | linux-87063dfcea80316ff4647b9906d146b5c7969766.tar.xz linux-87063dfcea80316ff4647b9906d146b5c7969766.zip | |
ASoC: Use dai_fmt in poodle machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/poodle.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index a321b4df534c..fd0ed10c6fe7 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -121,18 +121,6 @@ static int poodle_hw_params(struct snd_pcm_substream *substream, 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 */ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, clk, SND_SOC_CLOCK_IN); @@ -263,6 +251,8 @@ static struct snd_soc_dai_link poodle_dai = { .platform_name = "pxa-pcm-audio", .codec_name = "wm8731.0-001b", .init = poodle_wm8731_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &poodle_ops, }; |