From a2f01f685dbbdcbd3b138a0b1bab0ea09cc68c50 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 17 Apr 2007 12:35:48 +0200 Subject: [PATCH] --- yaml --- r: 56175 b: refs/heads/master c: e81208fe5881b700cfb25db1ecb769ecbfff40cc h: refs/heads/master i: 56173: c56e9d2f009669d46741b34fa149f4d051b0433a 56171: 27a98acf4e5f5f72a752a7a6c2679649956b656d 56167: 23321334b02458dc00b14147ab21fb0283a43c4a 56159: 5efd8f837f0da404eeb30733b4cccb1dc0598f7e v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 6 ++++-- trunk/sound/soc/s3c24xx/s3c24xx-i2s.h | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf03278ff96d..bb51269d525f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f1bc26e7df85957bcc48442f135e7a6f85e5edc +refs/heads/master: e81208fe5881b700cfb25db1ecb769ecbfff40cc diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c index df655a5db536..8ca314dc8891 100644 --- a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -61,13 +61,15 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { .client = &s3c24xx_dma_client_out, .channel = DMACH_I2S_OUT, - .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO + .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, + .dma_size = 2, }; static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { .client = &s3c24xx_dma_client_in, .channel = DMACH_I2S_IN, - .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO + .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, + .dma_size = 2, }; struct s3c24xx_i2s_info { diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.h b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.h index f9ca04edacb7..537b4ecce8a3 100644 --- a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.h +++ b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.h @@ -32,4 +32,6 @@ u32 s3c24xx_i2s_get_clockrate(void); +extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; + #endif /*S3C24XXI2S_H_*/