aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-i2s.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-i2s.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-i2s.c')
-rw-r--r--sound/soc/davinci/davinci-i2s.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 51ceded8a245..0fee779e3c76 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -271,7 +271,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
271 } 271 }
272 272
273 switch (fmt & SND_SOC_DAIFMT_INV_MASK) { 273 switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
274 case SND_SOC_DAIFMT_IB_NF: 274 case SND_SOC_DAIFMT_NB_NF:
275 /* CLKRP Receive clock polarity, 275 /* CLKRP Receive clock polarity,
276 * 1 - sampled on rising edge of CLKR 276 * 1 - sampled on rising edge of CLKR
277 * valid on rising edge 277 * valid on rising edge
@@ -283,7 +283,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
283 */ 283 */
284 pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP); 284 pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP);
285 break; 285 break;
286 case SND_SOC_DAIFMT_NB_IF: 286 case SND_SOC_DAIFMT_IB_IF:
287 /* CLKRP Receive clock polarity, 287 /* CLKRP Receive clock polarity,
288 * 0 - sampled on falling edge of CLKR 288 * 0 - sampled on falling edge of CLKR
289 * valid on falling edge 289 * valid on falling edge
@@ -295,7 +295,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
295 */ 295 */
296 pcr |= (DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP); 296 pcr |= (DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);
297 break; 297 break;
298 case SND_SOC_DAIFMT_IB_IF: 298 case SND_SOC_DAIFMT_NB_IF:
299 /* CLKRP Receive clock polarity, 299 /* CLKRP Receive clock polarity,
300 * 1 - sampled on rising edge of CLKR 300 * 1 - sampled on rising edge of CLKR
301 * valid on rising edge 301 * valid on rising edge
@@ -308,7 +308,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
308 pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP | 308 pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP |
309 DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP); 309 DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);
310 break; 310 break;
311 case SND_SOC_DAIFMT_NB_NF: 311 case SND_SOC_DAIFMT_IB_NF:
312 /* CLKRP Receive clock polarity, 312 /* CLKRP Receive clock polarity,
313 * 0 - sampled on falling edge of CLKR 313 * 0 - sampled on falling edge of CLKR
314 * valid on falling edge 314 * valid on falling edge