Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132907
b: refs/heads/master
c: 14cbba8
h: refs/heads/master
i:
  132905: 729c2be
  132903: b9a020a
v: v3
  • Loading branch information
Hugo Villeneuve authored and Mark Brown committed Mar 10, 2009
1 parent d5f8f1e commit 29eee83
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3d7e3c99d855faf093b06dc381b821a9d8d3c23
refs/heads/master: 14cbba89ae967d2e9106a80b270b078d7699109a
17 changes: 10 additions & 7 deletions trunk/sound/soc/davinci/davinci-sffsdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
#include "davinci-pcm.h"
#include "davinci-i2s.h"

/*
* CLKX and CLKR are the inputs for the Sample Rate Generator.
* FSX and FSR are outputs, driven by the sample Rate Generator.
*/
#define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
SND_SOC_DAIFMT_CBM_CFS | \
SND_SOC_DAIFMT_IB_NF)

static int sffsdr_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
Expand All @@ -56,13 +64,8 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
}
#endif

/* Set cpu DAI configuration:
* CLKX and CLKR are the inputs for the Sample Rate Generator.
* FSX and FSR are outputs, driven by the sample Rate Generator. */
ret = snd_soc_dai_set_fmt(cpu_dai,
SND_SOC_DAIFMT_RIGHT_J |
SND_SOC_DAIFMT_CBM_CFS |
SND_SOC_DAIFMT_IB_NF);
/* set cpu DAI configuration */
ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);
if (ret < 0)
return ret;

Expand Down

0 comments on commit 29eee83

Please sign in to comment.