summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/tavorevb3.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-30 23:43:44 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-02 13:08:39 +0000
commitc49c7f0cf91c8506d0a0ed61227a0da3b243384d (patch)
tree661111e53834f7bdc030c5e76cdcc63e2d67989d /sound/soc/pxa/tavorevb3.c
parent385bd9379babaf0982c76e4c073d928e830df6ad (diff)
downloadblackbird-op-linux-c49c7f0cf91c8506d0a0ed61227a0da3b243384d.tar.gz
blackbird-op-linux-c49c7f0cf91c8506d0a0ed61227a0da3b243384d.zip
ASoC: Use dai_fmt in tavorevb3 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/tavorevb3.c')
-rw-r--r--sound/soc/pxa/tavorevb3.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/pxa/tavorevb3.c b/sound/soc/pxa/tavorevb3.c
index 56ee82f61189..8b5ab8f72726 100644
--- a/sound/soc/pxa/tavorevb3.c
+++ b/sound/soc/pxa/tavorevb3.c
@@ -92,16 +92,6 @@ static int evb3_i2s_hw_params(struct snd_pcm_substream *substream,
if (ret < 0)
return ret;
- ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
- if (ret < 0)
- return ret;
-
- ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
- if (ret < 0)
- return ret;
-
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 3, 3, 2, width);
return ret;
}
@@ -119,6 +109,8 @@ static struct snd_soc_dai_link evb3_dai[] = {
.platform_name = "pxa-pcm-audio",
.codec_name = "88pm860x-codec",
.init = evb3_pm860x_init,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
.ops = &evb3_i2s_ops,
},
};
OpenPOWER on IntegriCloud