diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-17 02:36:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-19 19:51:59 -0500 |
commit | f521812b03eb906ece7433ffd681fd5a35c0aced (patch) | |
tree | 443dbbf69e6a1823961efd4f209519b4efe75a14 /sound/soc/ep93xx | |
parent | 5ab2ab6a432e93f083db3904f9bcbaa97d4b1d35 (diff) |
ASoC: Use dai_fmt in edb93xx machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ep93xx')
-rw-r--r-- | sound/soc/ep93xx/edb93xx.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c index 6b90c757cf4c..9f6fecdf49e7 100644 --- a/sound/soc/ep93xx/edb93xx.c +++ b/sound/soc/ep93xx/edb93xx.c | |||
@@ -48,18 +48,6 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream, | |||
48 | else | 48 | else |
49 | mclk_rate = rate * 64 * 2; | 49 | mclk_rate = rate * 64 * 2; |
50 | 50 | ||
51 | err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
52 | SND_SOC_DAIFMT_NB_IF | | ||
53 | SND_SOC_DAIFMT_CBS_CFS); | ||
54 | if (err) | ||
55 | return err; | ||
56 | |||
57 | err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
58 | SND_SOC_DAIFMT_NB_IF | | ||
59 | SND_SOC_DAIFMT_CBS_CFS); | ||
60 | if (err) | ||
61 | return err; | ||
62 | |||
63 | err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate, | 51 | err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate, |
64 | SND_SOC_CLOCK_IN); | 52 | SND_SOC_CLOCK_IN); |
65 | if (err) | 53 | if (err) |
@@ -80,6 +68,8 @@ static struct snd_soc_dai_link edb93xx_dai = { | |||
80 | .cpu_dai_name = "ep93xx-i2s", | 68 | .cpu_dai_name = "ep93xx-i2s", |
81 | .codec_name = "spi0.0", | 69 | .codec_name = "spi0.0", |
82 | .codec_dai_name = "cs4271-hifi", | 70 | .codec_dai_name = "cs4271-hifi", |
71 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | | ||
72 | SND_SOC_DAIFMT_CBS_CFS, | ||
83 | .ops = &edb93xx_ops, | 73 | .ops = &edb93xx_ops, |
84 | }; | 74 | }; |
85 | 75 | ||