diff options
author | Hugo Villeneuve <hugo@hugovil.com> | 2009-03-09 23:32:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 11:42:48 -0400 |
commit | 14cbba89ae967d2e9106a80b270b078d7699109a (patch) | |
tree | 58a6586d3bf1daef8271b0c25a9207f7588ef5bf | |
parent | b3d7e3c99d855faf093b06dc381b821a9d8d3c23 (diff) |
ALSA: ASoC: Davinci: Replaced DAI format RIGHT_J by DSP_B for SFFSDR
Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index 0bf81abba8c7..a1ae3736a5d7 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c | |||
@@ -36,6 +36,14 @@ | |||
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 | |||
39 | static int sffsdr_hw_params(struct snd_pcm_substream *substream, | 47 | static 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) | 49 | struct snd_soc_dai *dai) |
@@ -56,13 +64,8 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream, | |||
56 | } | 64 | } |
57 | #endif | 65 | #endif |
58 | 66 | ||
59 | /* Set cpu DAI configuration: | 67 | /* set cpu DAI configuration */ |
60 | * CLKX and CLKR are the inputs for the Sample Rate Generator. | 68 | 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) | 69 | if (ret < 0) |
67 | return ret; | 70 | return ret; |
68 | 71 | ||