diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 23:44:37 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 13:08:36 +0000 |
| commit | 36c1b400188266be737392c1ce9b74e3e7136be2 (patch) | |
| tree | 0325a87426b269b489ed1c0f814da1dafaeabad8 /sound | |
| parent | c0e942310a0a8881ace0a8bf0aa9e7efbb988309 (diff) | |
| download | linux-36c1b400188266be737392c1ce9b74e3e7136be2.tar.gz linux-36c1b400188266be737392c1ce9b74e3e7136be2.tar.bz2 linux-36c1b400188266be737392c1ce9b74e3e7136be2.zip | |
ASoC: Use dai_fmt in z2 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')
| -rw-r--r-- | sound/soc/pxa/z2.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index d6807e0372bd..e8f15ce83749 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -56,18 +56,6 @@ static int z2_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, WM8750_SYSCLK, clk, SND_SOC_CLOCK_IN); @@ -196,6 +184,8 @@ static struct snd_soc_dai_link z2_dai = { .platform_name = "pxa-pcm-audio", .codec_name = "wm8750.0-001b", .init = z2_wm8750_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &z2_ops, }; |