aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r--sound/soc/davinci/Kconfig2
-rw-r--r--sound/soc/davinci/davinci-sffsdr.c20
2 files changed, 12 insertions, 10 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index b502741692d6..bd7392c9657e 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -20,7 +20,7 @@ config SND_DAVINCI_SOC_EVM
20 20
21config SND_DAVINCI_SOC_SFFSDR 21config SND_DAVINCI_SOC_SFFSDR
22 tristate "SoC Audio support for SFFSDR" 22 tristate "SoC Audio support for SFFSDR"
23 depends on SND_DAVINCI_SOC && MACH_DAVINCI_SFFSDR 23 depends on SND_DAVINCI_SOC && MACH_SFFSDR
24 select SND_DAVINCI_SOC_I2S 24 select SND_DAVINCI_SOC_I2S
25 select SND_SOC_PCM3008 25 select SND_SOC_PCM3008
26 select SFFSDR_FPGA 26 select SFFSDR_FPGA
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index 0bf81abba8c7..40eccfe9e358 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -36,9 +36,16 @@
36#include "davinci-pcm.h" 36#include "davinci-pcm.h"
37#include "davinci-i2s.h" 37#include "davinci-i2s.h"
38 38
39/*
40 * CLKX and CLKR are the inputs for the Sample Rate Generator.
41 * FSX and FSR are outputs, driven by the sample Rate Generator.
42 */
43#define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
44 SND_SOC_DAIFMT_CBM_CFS | \
45 SND_SOC_DAIFMT_IB_NF)
46
39static int sffsdr_hw_params(struct snd_pcm_substream *substream, 47static int sffsdr_hw_params(struct snd_pcm_substream *substream,
40 struct snd_pcm_hw_params *params, 48 struct snd_pcm_hw_params *params)
41 struct snd_soc_dai *dai)
42{ 49{
43 struct snd_soc_pcm_runtime *rtd = substream->private_data; 50 struct snd_soc_pcm_runtime *rtd = substream->private_data;
44 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 51 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
@@ -56,13 +63,8 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
56 } 63 }
57#endif 64#endif
58 65
59 /* Set cpu DAI configuration: 66 /* set cpu DAI configuration */
60 * CLKX and CLKR are the inputs for the Sample Rate Generator. 67 ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);
61 * FSX and FSR are outputs, driven by the sample Rate Generator. */
62 ret = snd_soc_dai_set_fmt(cpu_dai,
63 SND_SOC_DAIFMT_RIGHT_J |
64 SND_SOC_DAIFMT_CBM_CFS |
65 SND_SOC_DAIFMT_IB_NF);
66 if (ret < 0) 68 if (ret < 0)
67 return ret; 69 return ret;
68 70