diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 10:42:55 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 08:08:35 -0500 |
commit | c0e942310a0a8881ace0a8bf0aa9e7efbb988309 (patch) | |
tree | 1f95ef30b2d50ca3de4fdccea631cf835f76ebf7 /sound/soc/pxa | |
parent | 2ce7f207c33578ba147c359ccf173b88271d992b (diff) |
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>
Diffstat (limited to 'sound/soc/pxa')
-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 bb060482c00d..76288ad905e2 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, | |||
143 | break; | 143 | break; |
144 | } | 144 | } |
145 | 145 | ||
146 | /* set codec DAI configuration */ | ||
147 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
148 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
149 | if (ret < 0) | ||
150 | return ret; | ||
151 | |||
152 | /* set cpu DAI configuration */ | ||
153 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
154 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
155 | if (ret < 0) | ||
156 | return ret; | ||
157 | |||
158 | /* set the codec system clock for DAC and ADC */ | 146 | /* set the codec system clock for DAC and ADC */ |
159 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk, | 147 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk, |
160 | SND_SOC_CLOCK_IN); | 148 | SND_SOC_CLOCK_IN); |
@@ -313,6 +301,8 @@ static struct snd_soc_dai_link spitz_dai = { | |||
313 | .platform_name = "pxa-pcm-audio", | 301 | .platform_name = "pxa-pcm-audio", |
314 | .codec_name = "wm8750.0-001b", | 302 | .codec_name = "wm8750.0-001b", |
315 | .init = spitz_wm8750_init, | 303 | .init = spitz_wm8750_init, |
304 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
305 | SND_SOC_DAIFMT_CBS_CFS, | ||
316 | .ops = &spitz_ops, | 306 | .ops = &spitz_ops, |
317 | }; | 307 | }; |
318 | 308 | ||