diff options
author | Lopez Cruz, Misael <x0052729@ti.com> | 2009-06-19 04:23:42 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-22 06:24:04 -0400 |
commit | c264301c777840b2df130e042b7f5a0c1041646f (patch) | |
tree | 719c2a6dbe604f253287f8a348670f7311913689 /sound/soc | |
parent | e370f45aeb76634d81a59b3b8f45b0f2faebef9b (diff) |
ASoC: TWL4030: Fix voice interface clock masters
Voice interface of twl4030 codec supports: CBM_CFM and
CBS_CFS. It doesn't support CBS_CFM.
Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Acked-By: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/sdp3430.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/zoom2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 4275eea31450..091125c888ed 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -1946,7 +1946,7 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, | |||
1946 | 1946 | ||
1947 | /* set master/slave audio interface */ | 1947 | /* set master/slave audio interface */ |
1948 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | 1948 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
1949 | case SND_SOC_DAIFMT_CBS_CFM: | 1949 | case SND_SOC_DAIFMT_CBM_CFM: |
1950 | format &= ~(TWL4030_VIF_SLAVE_EN); | 1950 | format &= ~(TWL4030_VIF_SLAVE_EN); |
1951 | break; | 1951 | break; |
1952 | case SND_SOC_DAIFMT_CBS_CFS: | 1952 | case SND_SOC_DAIFMT_CBS_CFS: |
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index b719e5db4f57..c51594d8fd13 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -96,7 +96,7 @@ static int sdp3430_hw_voice_params(struct snd_pcm_substream *substream, | |||
96 | ret = snd_soc_dai_set_fmt(codec_dai, | 96 | ret = snd_soc_dai_set_fmt(codec_dai, |
97 | SND_SOC_DAIFMT_DSP_A | | 97 | SND_SOC_DAIFMT_DSP_A | |
98 | SND_SOC_DAIFMT_IB_NF | | 98 | SND_SOC_DAIFMT_IB_NF | |
99 | SND_SOC_DAIFMT_CBS_CFM); | 99 | SND_SOC_DAIFMT_CBM_CFM); |
100 | if (ret) { | 100 | if (ret) { |
101 | printk(KERN_ERR "can't set codec DAI configuration\n"); | 101 | printk(KERN_ERR "can't set codec DAI configuration\n"); |
102 | return ret; | 102 | return ret; |
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index be2e307fdf72..3de6d2bd3903 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c | |||
@@ -92,7 +92,7 @@ static int zoom2_hw_voice_params(struct snd_pcm_substream *substream, | |||
92 | ret = snd_soc_dai_set_fmt(codec_dai, | 92 | ret = snd_soc_dai_set_fmt(codec_dai, |
93 | SND_SOC_DAIFMT_DSP_A | | 93 | SND_SOC_DAIFMT_DSP_A | |
94 | SND_SOC_DAIFMT_IB_NF | | 94 | SND_SOC_DAIFMT_IB_NF | |
95 | SND_SOC_DAIFMT_CBS_CFM); | 95 | SND_SOC_DAIFMT_CBM_CFM); |
96 | if (ret) { | 96 | if (ret) { |
97 | printk(KERN_ERR "can't set codec DAI configuration\n"); | 97 | printk(KERN_ERR "can't set codec DAI configuration\n"); |
98 | return ret; | 98 | return ret; |