aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2009-04-23 07:36:48 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-23 11:11:17 -0400
commit31a00c6b7c0c4f01be49f02660de920c8b82b613 (patch)
treedafa79d09eaa5b87ab1b63c36e3b363d2d63d9ea /sound/soc/omap
parentb933453f1965c1e3136cb5fd69abd6e6927fb5d7 (diff)
ASoC: OMAP: Add 4 channel support to mcbsp
Add 4 channel support to omap-mcbsp. This mode is going to be used by the twl4030 codec, when it is configured in Option1 mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/omap-mcbsp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 495192af8c2e..a5d46a7b196a 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -259,6 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
259 regs->xcr2 |= XFRLEN2(wpf - 1); 259 regs->xcr2 |= XFRLEN2(wpf - 1);
260 } 260 }
261 case 1: 261 case 1:
262 case 4:
262 /* Set word per (McBSP) frame for phase1 */ 263 /* Set word per (McBSP) frame for phase1 */
263 regs->rcr1 |= RFRLEN1(wpf - 1); 264 regs->rcr1 |= RFRLEN1(wpf - 1);
264 regs->xcr1 |= XFRLEN1(wpf - 1); 265 regs->xcr1 |= XFRLEN1(wpf - 1);
@@ -506,13 +507,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
506 .id = (link_id), \ 507 .id = (link_id), \
507 .playback = { \ 508 .playback = { \
508 .channels_min = 1, \ 509 .channels_min = 1, \
509 .channels_max = 2, \ 510 .channels_max = 4, \
510 .rates = OMAP_MCBSP_RATES, \ 511 .rates = OMAP_MCBSP_RATES, \
511 .formats = SNDRV_PCM_FMTBIT_S16_LE, \ 512 .formats = SNDRV_PCM_FMTBIT_S16_LE, \
512 }, \ 513 }, \
513 .capture = { \ 514 .capture = { \
514 .channels_min = 1, \ 515 .channels_min = 1, \
515 .channels_max = 2, \ 516 .channels_max = 4, \
516 .rates = OMAP_MCBSP_RATES, \ 517 .rates = OMAP_MCBSP_RATES, \
517 .formats = SNDRV_PCM_FMTBIT_S16_LE, \ 518 .formats = SNDRV_PCM_FMTBIT_S16_LE, \
518 }, \ 519 }, \