summaryrefslogtreecommitdiff
path: root/sound/soc/omap/omap-hdmi.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-09-14 15:05:56 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-22 11:13:01 -0400
commitf05cc9dac99ac6403d057d2cccb3c754714d2f32 (patch)
tree638491093acf7d5d652fa6c752f7108c186aec7c /sound/soc/omap/omap-hdmi.c
parent04564e3258304df607d4536de42603b4c8e21e1a (diff)
downloadlinux-3.10-f05cc9dac99ac6403d057d2cccb3c754714d2f32.tar.gz
linux-3.10-f05cc9dac99ac6403d057d2cccb3c754714d2f32.tar.bz2
linux-3.10-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-hdmi.c')
-rw-r--r--sound/soc/omap/omap-hdmi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index b19464697ac..095176738fd 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -34,7 +34,6 @@
#include <sound/asoundef.h>
#include <video/omapdss.h>
-#include <plat/dma.h>
#include "omap-pcm.h"
#include "omap-hdmi.h"
@@ -100,7 +99,7 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}
- priv->dma_params.data_type = OMAP_DMA_DATA_TYPE_S32;
+ priv->dma_params.data_type = 32;
snd_soc_dai_set_dma_data(dai, substream,
&priv->dma_params);