diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 22:40:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 22:41:06 +0100 |
| commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
| tree | fdc33154820cfddc845cef2f67380dace655b28f /sound | |
| parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
| parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) | |
| download | blackbird-op-linux-547c32aeb5a24178ef20488ae0508efcc32ae8e4.tar.gz blackbird-op-linux-547c32aeb5a24178ef20488ae0508efcc32ae8e4.zip | |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 1 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 1 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 2 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 21 |
4 files changed, 11 insertions, 14 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index b7e0b3f0bfc8..c35b74b2d1da 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/clk.h> #include <linux/kernel.h> #include <linux/io.h> diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 3698f707c44d..3f03d5ddfacd 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -19,6 +19,7 @@ #include <linux/io.h> #include <linux/wait.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/clk.h> #include <sound/core.h> diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index cc066964dad6..556e35f0ab73 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -21,6 +21,8 @@ #include <linux/clk.h> #include <linux/jiffies.h> #include <linux/io.h> +#include <linux/gpio.h> + #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 169ddad31575..eecfa5eba06b 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c @@ -218,24 +218,17 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) * sync to pclk, half-word transfers to the IIS-FIFO. */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC | - S3C2410_DISRCC_APB, prtd->params->dma_addr); - - s3c2410_dma_config(prtd->params->channel, - prtd->params->dma_size, - S3C2410_DCON_SYNC_PCLK | - S3C2410_DCON_HANDSHAKE); + S3C2410_DMASRC_MEM, + prtd->params->dma_addr); } else { - s3c2410_dma_config(prtd->params->channel, - prtd->params->dma_size, - S3C2410_DCON_HANDSHAKE | - S3C2410_DCON_SYNC_PCLK); - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_HW, 0x3, - prtd->params->dma_addr); + 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; |
