diff options
author | Graeme Gregory <gg@opensource.wolfsonmicro.com> | 2007-04-17 06:35:48 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:56:03 -0400 |
commit | e81208fe5881b700cfb25db1ecb769ecbfff40cc (patch) | |
tree | 4ff17a7c2195a1a3d9255e9ea2f8319a768bdddf | |
parent | 7f1bc26e7df85957bcc48442f135e7a6f85e5edc (diff) |
[ALSA] ASoC Samsung S3C24xx updates - i2s
This patch adds DMA size fields to the S3C24xx audio DMA params and
exports the S3C24xx I2S digital audio interface.
Signed-off-by: Graeme Gregory <gg@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 6 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index df655a5db536..8ca314dc8891 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -61,13 +61,15 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { | |||
61 | static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { | 61 | static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { |
62 | .client = &s3c24xx_dma_client_out, | 62 | .client = &s3c24xx_dma_client_out, |
63 | .channel = DMACH_I2S_OUT, | 63 | .channel = DMACH_I2S_OUT, |
64 | .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO | 64 | .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, |
65 | .dma_size = 2, | ||
65 | }; | 66 | }; |
66 | 67 | ||
67 | static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { | 68 | static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { |
68 | .client = &s3c24xx_dma_client_in, | 69 | .client = &s3c24xx_dma_client_in, |
69 | .channel = DMACH_I2S_IN, | 70 | .channel = DMACH_I2S_IN, |
70 | .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO | 71 | .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, |
72 | .dma_size = 2, | ||
71 | }; | 73 | }; |
72 | 74 | ||
73 | struct s3c24xx_i2s_info { | 75 | struct s3c24xx_i2s_info { |
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.h b/sound/soc/s3c24xx/s3c24xx-i2s.h index f9ca04edacb7..537b4ecce8a3 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.h +++ b/sound/soc/s3c24xx/s3c24xx-i2s.h | |||
@@ -32,4 +32,6 @@ | |||
32 | 32 | ||
33 | u32 s3c24xx_i2s_get_clockrate(void); | 33 | u32 s3c24xx_i2s_get_clockrate(void); |
34 | 34 | ||
35 | extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; | ||
36 | |||
35 | #endif /*S3C24XXI2S_H_*/ | 37 | #endif /*S3C24XXI2S_H_*/ |