lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: OMAP: Add 4 channel support to mcbsp

Browse Source 
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>
This commit is contained in:
Peter Ujfalusi
2009-04-23 14:36:48 +03:00
committed by Mark Brown
parent b933453f19
commit 31a00c6b7c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/omap/omap-mcbsp.c
View File

@@ -259,6 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
regs->xcr2 |= XFRLEN2(wpf - 1); regs->xcr2 |= XFRLEN2(wpf - 1);
} }
case 1: case 1:
case 4:
/* Set word per (McBSP) frame for phase1 */ /* Set word per (McBSP) frame for phase1 */
regs->rcr1 |= RFRLEN1(wpf - 1); regs->rcr1 |= RFRLEN1(wpf - 1);
regs->xcr1 |= XFRLEN1(wpf - 1); regs->xcr1 |= XFRLEN1(wpf - 1);
@@ -506,13 +507,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
.id = (link_id), \ .id = (link_id), \
.playback = { \ .playback = { \
.channels_min = 1, \ .channels_min = 1, \
.channels_max = 2, \ .channels_max = 4, \
.rates = OMAP_MCBSP_RATES, \ .rates = OMAP_MCBSP_RATES, \
.formats = SNDRV_PCM_FMTBIT_S16_LE, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \
}, \ }, \
.capture = { \ .capture = { \
.channels_min = 1, \ .channels_min = 1, \
.channels_max = 2, \ .channels_max = 4, \
.rates = OMAP_MCBSP_RATES, \ .rates = OMAP_MCBSP_RATES, \
.formats = SNDRV_PCM_FMTBIT_S16_LE, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \
}, \ }, \