From 8c9daf05dd836b7b3f041e7cb586a7d7c6fbab04 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 20 Dec 2011 16:27:28 +0800 Subject: [PATCH] --- yaml --- r: 283993 b: refs/heads/master c: 52ec35f64ecdd7ef759ce594061be780ca4b324b h: refs/heads/master i: 283991: 27c1392973afd68a8a5e5eac0f6efe0d5a34c4d3 v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/imote2.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 0b0375d3a471..2245ae1f043d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 673847cfb0b07ba42d23f32d42e59eeda81c3b2f +refs/heads/master: 52ec35f64ecdd7ef759ce594061be780ca4b324b diff --git a/trunk/sound/soc/pxa/imote2.c b/trunk/sound/soc/pxa/imote2.c index 97d3aecfc203..dc905aec6294 100644 --- a/trunk/sound/soc/pxa/imote2.c +++ b/trunk/sound/soc/pxa/imote2.c @@ -30,20 +30,6 @@ static int imote2_asoc_hw_params(struct snd_pcm_substream *substream, break; } - /* set codec DAI configuration */ - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S - | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - - /* CPU should be clock master */ - ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S - | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk, SND_SOC_CLOCK_IN); if (ret < 0) @@ -67,6 +53,8 @@ static struct snd_soc_dai_link imote2_dai = { .codec_dai_name = "wm8940-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm8940-codec.0-0034", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &imote2_asoc_ops, };