diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 23:41:54 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 13:08:35 +0000 |
| commit | 2ce7f207c33578ba147c359ccf173b88271d992b (patch) | |
| tree | 714503f5c6604122936abdccd81596c9106bf788 | |
| parent | fe75fe0e041bd5badc6a0be0c3918590198df2a0 (diff) | |
| download | op-kernel-dev-2ce7f207c33578ba147c359ccf173b88271d992b.zip op-kernel-dev-2ce7f207c33578ba147c359ccf173b88271d992b.tar.gz | |
ASoC: Use dai_fmt in saarb 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>
| -rw-r--r-- | sound/soc/pxa/saarb.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c index 2e21712..b2be225 100644 --- a/sound/soc/pxa/saarb.c +++ b/sound/soc/pxa/saarb.c @@ -92,15 +92,6 @@ static int saarb_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 +110,8 @@ static struct snd_soc_dai_link saarb_dai[] = { .platform_name = "pxa-pcm-audio", .codec_name = "88pm860x-codec", .init = saarb_pm860x_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &saarb_i2s_ops, }, }; |
