diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 23:42:55 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 13:08:35 +0000 |
| commit | c0e942310a0a8881ace0a8bf0aa9e7efbb988309 (patch) | |
| tree | 1f95ef30b2d50ca3de4fdccea631cf835f76ebf7 | |
| parent | 2ce7f207c33578ba147c359ccf173b88271d992b (diff) | |
| download | kernel_goldelico_gta04-c0e942310a0a8881ace0a8bf0aa9e7efbb988309.zip kernel_goldelico_gta04-c0e942310a0a8881ace0a8bf0aa9e7efbb988309.tar.gz kernel_goldelico_gta04-c0e942310a0a8881ace0a8bf0aa9e7efbb988309.tar.bz2 | |
ASoC: Use dai_fmt in spitz 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>
| -rw-r--r-- | sound/soc/pxa/spitz.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index bb06048..76288ad 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -143,18 +143,6 @@ static int spitz_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); @@ -313,6 +301,8 @@ static struct snd_soc_dai_link spitz_dai = { .platform_name = "pxa-pcm-audio", .codec_name = "wm8750.0-001b", .init = spitz_wm8750_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &spitz_ops, }; |