[PATCH] OMAP audio DMA changes for 310 CPUs

andrzej zaborowski
2006-08-18T08:20:39Z

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

Avoid restarting McBSP hardware after every DMA transfer to OMAP audio
devices on OMAP310, restart only DMA. Also avoid trying to link DMA
channels together as this feature isn't supported on 310 processors.
Apply on top of "[PATCH 1/5] Change all omap15xx devices to use
similar DMA handling than h6300 uses".

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

[-- Attachment #2: linux-omap310-audio.patch --]
[-- Type: application/octet-stream, Size: 1644 bytes --]

diff -pNaur -X b/Documentation/dontdiff a/sound/arm/omap/omap-alsa-dma.c b/sound/arm/omap/omap-alsa-dma.c
--- a/sound/arm/omap/omap-alsa-dma.c 2006-03-22 17:45:13.000000000 +0000
+++ b/sound/arm/omap/omap-alsa-dma.c 2006-08-18 00:01:23.000000000 +0000
@@ -200,7 +200,7 @@ int omap_request_alsa_sound_dma(int devi
}

/* Chain the channels together */
- if (!cpu_is_omap1510())
+ if (!cpu_is_omap15xx())
omap_sound_dma_link_lch(data);

spin_unlock(&dma_list_lock);
@@ -251,7 +251,7 @@ int omap_free_alsa_sound_dma(void *data,
}
chan = (*channels);

- if (!cpu_is_omap1510())
+ if (!cpu_is_omap15xx())
omap_sound_dma_unlink_lch(data);
for (i = 0; i < nr_linked_channels; i++) {
int cur_chan = chan[i];
@@ -349,7 +349,8 @@ static int audio_start_dma_chain(struct
omap_start_dma(channel);
s->started = 1;
s->hw_start(); /* start McBSP interface */
- }
+ } else if (cpu_is_omap310())
+ omap_start_dma(channel);
/* else the dma itself will progress forward with out our help */
FN_OUT(0);
return 0;
diff -pNaur -X b/Documentation/dontdiff a/sound/arm/omap/omap-alsa.c b/sound/arm/omap/omap-alsa.c
--- a/sound/arm/omap/omap-alsa.c 2006-08-18 10:05:56.000000000 +0000
+++ b/sound/arm/omap/omap-alsa.c 2006-08-18 10:06:58.000000000 +0000
@@ -204,7 +204,7 @@ static void audio_process_dma(struct aud
* irq from DMA after the first transfered/played buffer.
* (invocation of callback_omap_alsa_sound_dma() method).
*/
- if (cpu_is_omap15xx()) {
+ if (cpu_is_omap1510()) {
spin_lock_irqsave(&s->dma_lock, flags);
omap_stop_alsa_sound_dma(s);
spin_unlock_irqrestore(&s->dma_lock, flags);

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]