Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux

* 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c
  ARM: S3C2440: mini2440: Fix spare warnings
  ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c
  ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST
  ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test
  ARM: S3C: Fix adc function exports
  ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set
  ARM: S3C24XX: Introduce S3C2442B CPU
  ARM: S3C24XX: Define a macro to avoid compilation error
  ARM: S3C: Add info for supporting circular DMA buffers
  ARM: S3C64XX: Set rate of crystal mux
  ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value

1 files changed, 15 insertions, 2 deletions

diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index 5cbbdc80fde3..1f35c6fcf5fd 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -75,11 +75,19 @@ static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream)
 {
         struct s3c24xx_runtime_data *prtd = substream->runtime->private_data;
         dma_addr_t pos = prtd->dma_pos;
+        unsigned int limit;
         int ret;
 
         pr_debug("Entered %s\n", __func__);
 
-        while (prtd->dma_loaded < prtd->dma_limit) {
+        if (s3c_dma_has_circular()) {
+                limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
+        } else
+                limit = prtd->dma_limit;
+
+        pr_debug("%s: loaded %d, limit %d\n", __func__, prtd->dma_loaded, limit);
+
+        while (prtd->dma_loaded < limit) {
                 unsigned long len = prtd->dma_period;
 
                 pr_debug("dma_loaded: %d\n", prtd->dma_loaded);
@@ -123,7 +131,7 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel,
                 snd_pcm_period_elapsed(substream);
 
         spin_lock(&prtd->lock);
-        if (prtd->state & ST_RUNNING) {
+        if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) {
                 prtd->dma_loaded--;
                 s3c24xx_pcm_enqueue(substream);
         }
@@ -164,6 +172,11 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
                         printk(KERN_ERR "failed to get dma channel\n");
                         return ret;
                 }
+
+                /* use the circular buffering if we have it available. */
+                if (s3c_dma_has_circular())
+                        s3c2410_dma_setflags(prtd->params->channel,
+                                             S3C2410_DMAF_CIRCULAR);
         }
 
         s3c2410_dma_set_buffdone_fn(prtd->params->channel,