diff options
| author | Peter Ujfalusi | 2012-09-14 14:05:56 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-09-22 17:13:01 +0200 |
| commit | f05cc9dac99ac6403d057d2cccb3c754714d2f32 (patch) | |
| tree | 638491093acf7d5d652fa6c752f7108c186aec7c /sound/soc/omap/omap-pcm.c | |
| parent | ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type (diff) | |
| download | kernel-qcow2-linux-f05cc9dac99ac6403d057d2cccb3c754714d2f32.tar.gz kernel-qcow2-linux-f05cc9dac99ac6403d057d2cccb3c754714d2f32.tar.xz kernel-qcow2-linux-f05cc9dac99ac6403d057d2cccb3c754714d2f32.zip | |
ASoC: omap-pcm, omap-dmic: Change the use of omap_pcm_dma_data->data_type
Instead of the OMAP DMA data type definition the data_type will be used to
specify the number of bits the DMA word should be configured or 0 in case
when based on the stream's format the omap-pcm can decide the needed DMA
word size.
This feature is needed for the omap-hdmi where the sDMA need to be
configured for 32bit word type regardless of the audio format used.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 4c13a5f4eebb..74da4b7209d0 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -183,7 +183,8 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream) memset(&dma_params, 0, sizeof(dma_params)); if (dma_data->data_type) - dma_params.data_type = dma_data->data_type; + dma_params.data_type = omap_pcm_get_dma_type( + dma_data->data_type); else dma_params.data_type = omap_pcm_get_dma_type( snd_pcm_format_physical_width(runtime->format)); |