summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-17 15:41:11 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-20 00:52:13 +0000
commitf49f85108b2b3b1aaa7632418411c401fbb6741c (patch)
treede4e172230b826ae2ed5a57df4ef6726def32607 /sound
parentf521812b03eb906ece7433ffd681fd5a35c0aced (diff)
downloadkernel-common-f49f85108b2b3b1aaa7632418411c401fbb6741c.tar.gz
kernel-common-f49f85108b2b3b1aaa7632418411c401fbb6741c.tar.bz2
kernel-common-f49f85108b2b3b1aaa7632418411c401fbb6741c.zip
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')
-rw-r--r--sound/soc/ep93xx/snappercl15.c12
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,
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
int err;
- err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
-
- err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
- if (err)
- return err;
-
err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK,
SND_SOC_CLOCK_IN);
if (err)
@@ -96,6 +86,8 @@ static struct snd_soc_dai_link snappercl15_dai = {
.codec_name = "tlv320aic23-codec.0-001a",
.platform_name = "ep93xx-pcm-audio",
.init = snappercl15_tlv320aic23_init,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
+ SND_SOC_DAIFMT_CBS_CFS,
.ops = &snappercl15_ops,
};