aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcbsp.c
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-12-22 03:21:36 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-22 11:15:20 -0500
commitbd25867a6cbe7a00ef7dbe8d9ddebc91b00b9b3f (patch)
tree0c462686869a0b46d81b7e38e01e7b7987ab2986 /sound/soc/omap/omap-mcbsp.c
parenta31501d1041c9d0a6c3f520736ae2b2fa081493a (diff)
ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
- OMAP McBSP DAI driver claims to support DSP_A format which has 1-bit data delay but configures link for 0-bit data delay which is in fact DSP_B - Fix this by changing format from DSP_A to DSP_B - Fix also TLV320AIC23 codec and OSK5912 machine drivers since the same error is populated also there Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Acked-by: Arun KS <arunks@mistralsolutions.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
-rw-r--r--sound/soc/omap/omap-mcbsp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 7b86373007ca..ec5e18a78758 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -270,7 +270,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
270 regs->srgr2 |= FPER(wlen * 2 - 1); 270 regs->srgr2 |= FPER(wlen * 2 - 1);
271 regs->srgr1 |= FWID(wlen - 1); 271 regs->srgr1 |= FWID(wlen - 1);
272 break; 272 break;
273 case SND_SOC_DAIFMT_DSP_A: 273 case SND_SOC_DAIFMT_DSP_B:
274 regs->srgr2 |= FPER(wlen * channels - 1); 274 regs->srgr2 |= FPER(wlen * channels - 1);
275 regs->srgr1 |= FWID(wlen * channels - 2); 275 regs->srgr1 |= FWID(wlen * channels - 2);
276 break; 276 break;
@@ -309,7 +309,7 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
309 regs->rcr2 |= RDATDLY(1); 309 regs->rcr2 |= RDATDLY(1);
310 regs->xcr2 |= XDATDLY(1); 310 regs->xcr2 |= XDATDLY(1);
311 break; 311 break;
312 case SND_SOC_DAIFMT_DSP_A: 312 case SND_SOC_DAIFMT_DSP_B:
313 /* 0-bit data delay */ 313 /* 0-bit data delay */
314 regs->rcr2 |= RDATDLY(0); 314 regs->rcr2 |= RDATDLY(0);
315 regs->xcr2 |= XDATDLY(0); 315 regs->xcr2 |= XDATDLY(0);