diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 11:13:24 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-30 10:44:45 +0000 |
| commit | 74f4dd56ffab34f280b83d18a5343ac96a7b91ad (patch) | |
| tree | 840033129690b7b99861e483ad4169821384511a /sound/soc | |
| parent | 87063dfcea80316ff4647b9906d146b5c7969766 (diff) | |
| download | linux-stable-74f4dd56ffab34f280b83d18a5343ac96a7b91ad.tar.gz linux-stable-74f4dd56ffab34f280b83d18a5343ac96a7b91ad.tar.bz2 linux-stable-74f4dd56ffab34f280b83d18a5343ac96a7b91ad.zip | |
ASoC: Use dai_fmt in corgi machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/pxa/corgi.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 5e5004a84073..5ff6dac4794d 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -142,18 +142,6 @@ static int corgi_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); @@ -311,6 +299,8 @@ static struct snd_soc_dai_link corgi_dai = { .platform_name = "pxa-pcm-audio", .codec_name = "wm8731.0-001b", .init = corgi_wm8731_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &corgi_ops, }; |