[alsa-devel] [PATCH 4/5] [RFC] ALSA ASOC adds destination and source port for dma
Adds destination and source ports for dma which is required for OMAP1
Signed-off-by: Arun KS arunks@mistralsolutions.com --- sound/soc/omap/omap-pcm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 690bfea..9e670ef 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -97,6 +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()) { /* * Link channel with itself so DMA doesn't need any @@ -147,12 +148,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
On Mon, Sep 29, 2008 at 03:23:52PM +0530, Arun KS wrote:
Adds destination and source ports for dma which is required for OMAP1
Signed-off-by: Arun KS arunks@mistralsolutions.com
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
On Mon, 29 Sep 2008 15:23:52 +0530 "ext Arun KS" arunks@mistralsolutions.com wrote:
Adds destination and source ports for dma which is required for OMAP1
Signed-off-by: Arun KS arunks@mistralsolutions.com
sound/soc/omap/omap-pcm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
err = omap_request_dma(dma_data->dma_req, dma_data->name, omap_pcm_dma_irq, substream, &prtd->dma_ch);
- if (!cpu_is_omap1510()) {
Accidentally added line? Actually it pointed out that line after it should include test for err before linking channel with itself.
if (!err && !cpu_is_omap1510()) {
dma_params.dst_port = OMAP_DMA_PORT_MPUI;
...
dma_params.src_port = OMAP_DMA_PORT_MPUI;
I don't have OMAP1 HW at hand to test but looks ok to me. And this port variable is used only with OMAP1's.
Jarkko -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Sep 29, 2008 at 03:23:52PM +0530, Arun KS wrote:
@@ -147,12 +148,14 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
Your MUA appears to have word wrapped and therefore corrupted this patch (and may well have done the same thing with the others). You might want to look into using something like git send-email to generate your patches if you can't see how to fix this with the client you are using.
participants (4)
-
Arun KS -
Jarkko Nikula -
Mark Brown -
Mark Brown