From 750846fa3d90e02fdd8c4621b6a558e15a5589b2 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Wed, 21 Oct 2009 23:10:03 +0200 Subject: [PATCH] --- yaml --- r: 170183 b: refs/heads/master c: 0ffc11800cb2a74b05c2f5b28966ebd50b27f70c h: refs/heads/master i: 170181: 755b45b6defb4a5cc94c49f3e315f3b0aa719f69 170179: 1154bd078678623e63d7f153be9eaa96061bd423 170175: b0a3c5ee12bae0db785883c8d2bb214ab45ff6a2 v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-pcm.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62d4643a8e8e..a0e740945960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 017deee63934349a70292666acfedea8e6eb6eb8 +refs/heads/master: 0ffc11800cb2a74b05c2f5b28966ebd50b27f70c diff --git a/trunk/sound/soc/omap/omap-pcm.c b/trunk/sound/soc/omap/omap-pcm.c index 5735945788bf..6a829eef2a4f 100644 --- a/trunk/sound/soc/omap/omap-pcm.c +++ b/trunk/sound/soc/omap/omap-pcm.c @@ -195,8 +195,12 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream) else omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ); - omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); - omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); + if (!(cpu_class_is_omap1())) { + omap_set_dma_src_burst_mode(prtd->dma_ch, + OMAP_DMA_DATA_BURST_16); + omap_set_dma_dest_burst_mode(prtd->dma_ch, + OMAP_DMA_DATA_BURST_16); + } return 0; }