aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-28 05:59:30 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-28 06:37:37 -0500
commit7e0d6ac0d894ebae2ff85ea6108dd065a274dfb9 (patch)
treec16070bb680c814eb5701687878616a34c353fe6 /sound/soc/kirkwood
parent077a2ba4c8e40e6256948c3b4cc60608a284f555 (diff)
ASoC: Use dai_fmt in kirkwood-t5325 machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r--sound/soc/kirkwood/kirkwood-t5325.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index a8930c7c9d1e..6e992307c252 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -25,18 +25,7 @@ static int t5325_hw_params(struct snd_pcm_substream *substream,
25{ 25{
26 struct snd_soc_pcm_runtime *rtd = substream->private_data; 26 struct snd_soc_pcm_runtime *rtd = substream->private_data;
27 struct snd_soc_dai *codec_dai = rtd->codec_dai; 27 struct snd_soc_dai *codec_dai = rtd->codec_dai;
28 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 28 unsigned int freq;
29 int ret;
30 unsigned int freq, fmt;
31
32 fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;
33 ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
34 if (ret < 0)
35 return ret;
36
37 ret = snd_soc_dai_set_fmt(codec_dai, fmt);
38 if (ret < 0)
39 return ret;
40 29
41 freq = params_rate(params) * 256; 30 freq = params_rate(params) * 256;
42 31
@@ -90,6 +79,7 @@ static struct snd_soc_dai_link t5325_dai[] = {
90 .platform_name = "kirkwood-pcm-audio", 79 .platform_name = "kirkwood-pcm-audio",
91 .codec_dai_name = "alc5621-hifi", 80 .codec_dai_name = "alc5621-hifi",
92 .codec_name = "alc562x-codec.0-001a", 81 .codec_name = "alc562x-codec.0-001a",
82 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
93 .ops = &t5325_ops, 83 .ops = &t5325_ops,
94 .init = t5325_dai_init, 84 .init = t5325_dai_init,
95}, 85},