aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-07-05 09:47:42 +0000
committerLars-Peter Clausen <lars@metafoo.de>2009-07-05 09:47:42 +0000
commitcaf8c9f59e60d64d5543bcfd8bb316eac85c54cf (patch)
tree6adf51e51fef336d56508723cfd9714de25101eb /target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
parent85afb807c53b3776d9457958abd6607502b83cd3 (diff)
downloadupstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.tar.gz
upstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.tar.bz2
upstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.zip
Update to 2.6.30.1, refresh patches
SVN-Revision: 16680
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch')
-rw-r--r--target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch b/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
index 871514a6e6..e0ff7c442c 100644
--- a/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
@@ -1288,9 +1288,9 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
---- a/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-06-10 05:05:27.000000000 +0200
-+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-05-16 13:25:48.000000000 +0200
-@@ -218,23 +231,16 @@
+--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
+@@ -218,24 +218,17 @@ static int s3c24xx_pcm_prepare(struct sn
* sync to pclk, half-word transfers to the IIS-FIFO. */
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
s3c2410_dma_devconfig(prtd->params->channel,
@@ -1315,9 +1315,10 @@
+ S3C2410_DMASRC_HW,
+ prtd->params->dma_addr);
}
-+
+
+ s3c2410_dma_config(prtd->params->channel,
+ prtd->params->dma_size);
-
++
/* flush the DMA channel */
s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
+ prtd->dma_loaded = 0;