aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-evm.c
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2008-12-19 15:05:23 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-20 08:05:39 -0500
commit9e031624d50c82a47671e09cc996eebb9e36f698 (patch)
tree78aaade35f344b92298f6159e7c32b5df2a1dcac /sound/soc/davinci/davinci-evm.c
parenta24f4f682661b8069d374a9197bc491525a7c799 (diff)
ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
Fix the meaning of SND_SOC_DAIFMT_NB_NF to match that used in the codec. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-evm.c')
-rw-r--r--sound/soc/davinci/davinci-evm.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 5c041bf05f31..d2476e206a87 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -28,6 +28,8 @@
28 28
29#define EVM_CODEC_CLOCK 22579200 29#define EVM_CODEC_CLOCK 22579200
30 30
31#define AUDIO_FORMAT (SND_SOC_DAIFMT_I2S | \
32 SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF)
31static int evm_hw_params(struct snd_pcm_substream *substream, 33static int evm_hw_params(struct snd_pcm_substream *substream,
32 struct snd_pcm_hw_params *params) 34 struct snd_pcm_hw_params *params)
33{ 35{
@@ -37,16 +39,12 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
37 int ret = 0; 39 int ret = 0;
38 40
39 /* set codec DAI configuration */ 41 /* set codec DAI configuration */
40 ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | 42 ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
41 SND_SOC_DAIFMT_CBM_CFM |
42 SND_SOC_DAIFMT_NB_NF);
43 if (ret < 0) 43 if (ret < 0)
44 return ret; 44 return ret;
45 45
46 /* set cpu DAI configuration */ 46 /* set cpu DAI configuration */
47 ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | 47 ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);
48 SND_SOC_DAIFMT_CBM_CFM |
49 SND_SOC_DAIFMT_IB_NF);
50 if (ret < 0) 48 if (ret < 0)
51 return ret; 49 return ret;
52 50