diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-17 02:41:11 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-19 19:52:13 -0500 |
commit | f49f85108b2b3b1aaa7632418411c401fbb6741c (patch) | |
tree | de4e172230b826ae2ed5a57df4ef6726def32607 /sound/soc/ep93xx/snappercl15.c | |
parent | f521812b03eb906ece7433ffd681fd5a35c0aced (diff) |
ASoC: Use dai_fmt in snappercl15 machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ep93xx/snappercl15.c')
-rw-r--r-- | sound/soc/ep93xx/snappercl15.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index 33901d647b72..e97cd5701f51 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c | |||
@@ -33,16 +33,6 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream, | |||
33 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 33 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
34 | int err; | 34 | int err; |
35 | 35 | ||
36 | err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
37 | SND_SOC_DAIFMT_NB_IF | | ||
38 | SND_SOC_DAIFMT_CBS_CFS); | ||
39 | |||
40 | err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
41 | SND_SOC_DAIFMT_NB_IF | | ||
42 | SND_SOC_DAIFMT_CBS_CFS); | ||
43 | if (err) | ||
44 | return err; | ||
45 | |||
46 | err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, | 36 | err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, |
47 | SND_SOC_CLOCK_IN); | 37 | SND_SOC_CLOCK_IN); |
48 | if (err) | 38 | if (err) |
@@ -96,6 +86,8 @@ static struct snd_soc_dai_link snappercl15_dai = { | |||
96 | .codec_name = "tlv320aic23-codec.0-001a", | 86 | .codec_name = "tlv320aic23-codec.0-001a", |
97 | .platform_name = "ep93xx-pcm-audio", | 87 | .platform_name = "ep93xx-pcm-audio", |
98 | .init = snappercl15_tlv320aic23_init, | 88 | .init = snappercl15_tlv320aic23_init, |
89 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | | ||
90 | SND_SOC_DAIFMT_CBS_CFS, | ||
99 | .ops = &snappercl15_ops, | 91 | .ops = &snappercl15_ops, |
100 | }; | 92 | }; |
101 | 93 | ||