summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArun KS <arunks@mistralsolutions.com>2008-09-30 12:05:16 +0200
committerTakashi Iwai <tiwai@suse.de>2008-10-13 02:18:26 +0200
commit9d37484c8ce06d95c53c2bbadfc205faaff834bc (patch)
treeeb12eb74c04cb7985a570c6f7f1481120cd1e648 /sound
parentALSA: ASoC: Drop device registration from GTA01 lm4857 driver (diff)
downloadlinux-9d37484c8ce06d95c53c2bbadfc205faaff834bc.tar.xz
linux-9d37484c8ce06d95c53c2bbadfc205faaff834bc.zip
ALSA: ASoC: Add destination and source port for DMA on OMAP1
Adds destination and source port for dma in platform driver as required by OMAP1 Signed-off-by: Arun KS <arunks@mistralsolutions.com> Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-pcm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 690bfeaec4a0..e9084fdd2082 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -97,7 +97,7 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
prtd->dma_data = dma_data;
err = omap_request_dma(dma_data->dma_req, dma_data->name,
omap_pcm_dma_irq, substream, &prtd->dma_ch);
- if (!cpu_is_omap1510()) {
+ if (!err & !cpu_is_omap1510()) {
/*
* Link channel with itself so DMA doesn't need any
* reprogramming while looping the buffer
@@ -147,12 +147,14 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
dma_params.src_or_dst_synch = OMAP_DMA_DST_SYNC;
dma_params.src_start = runtime->dma_addr;
dma_params.dst_start = dma_data->port_addr;
+ dma_params.dst_port = OMAP_DMA_PORT_MPUI;
} else {
dma_params.src_amode = OMAP_DMA_AMODE_CONSTANT;
dma_params.dst_amode = OMAP_DMA_AMODE_POST_INC;
dma_params.src_or_dst_synch = OMAP_DMA_SRC_SYNC;
dma_params.src_start = dma_data->port_addr;
dma_params.dst_start = runtime->dma_addr;
+ dma_params.src_port = OMAP_DMA_PORT_MPUI;
}
/*
* Set DMA transfer frame size equal to ALSA period size and frame