Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.10

A few more fixes, nothing too major though the DMA changes fix modular
builds.

4 files changed, 15 insertions, 14 deletions

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index aeb3a6627d6a..8b85049daab0 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -636,11 +636,12 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
          * callback, take it into account here. That allows us to for example
          * send 32 bits per channel to the codec, while only 16 of them carry
          * audio payload.
-         * The clock ratio is given for a full period of data (both left and
-         * right channels), so it has to be divided by 2.
+         * The clock ratio is given for a full period of data (for I2S format
+         * both left and right channels), so it has to be divided by number of
+         * tdm-slots (for I2S - divided by 2).
          */
         if (dev->bclk_lrclk_ratio)
-                word_length = dev->bclk_lrclk_ratio / 2;
+                word_length = dev->bclk_lrclk_ratio / dev->tdm_slots;
 
         /* mapping of the XSSZ bit-field as described in the datasheet */
         fmt = (word_length >> 1) - 1;
@@ -834,17 +835,20 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
         int word_length;
         u8 fifo_level;
         u8 slots = dev->tdm_slots;
+        u8 active_serializers;
         int channels;
         struct snd_interval *pcm_channels = hw_param_interval(params,
                                         SNDRV_PCM_HW_PARAM_CHANNELS);
         channels = pcm_channels->min;
 
+        active_serializers = (channels + slots - 1) / slots;
+
         if (davinci_hw_common_param(dev, substream->stream, channels) == -EINVAL)
                 return -EINVAL;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                fifo_level = dev->txnumevt;
+                fifo_level = dev->txnumevt * active_serializers;
         else
-                fifo_level = dev->rxnumevt;
+                fifo_level = dev->rxnumevt * active_serializers;
 
         if (dev->op_mode == DAVINCI_MCASP_DIT_MODE)
                 davinci_hw_dit_param(dev);
@@ -889,7 +893,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                 dma_params->acnt = dma_params->data_type;
 
         dma_params->fifo_level = fifo_level;
-        dma_params->active_serializers = (channels + slots - 1) / slots;
         davinci_config_channel_size(dev, word_length);
 
         return 0;
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 0edd3b5a37fd..a9ac0c11da71 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -38,7 +38,7 @@ struct davinci_audio_dev {
         u8      num_serializer;
         u8      *serial_dir;
         u8      version;
-        u8      bclk_lrclk_ratio;
+        u16     bclk_lrclk_ratio;
 
         /* McASP FIFO related */
         u8      txnumevt;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 078031d61167..b2f27c2e5fdc 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -181,7 +181,6 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
         unsigned short acnt;
         unsigned int count;
         unsigned int fifo_level;
-        unsigned char serializers = prtd->params->active_serializers;
 
         period_size = snd_pcm_lib_period_bytes(substream);
         dma_offset = prtd->period * period_size;
@@ -195,14 +194,14 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
         data_type = prtd->params->data_type;
         count = period_size / data_type;
         if (fifo_level)
-                count /= fifo_level * serializers;
+                count /= fifo_level;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 src = dma_pos;
                 dst = prtd->params->dma_addr;
                 src_bidx = data_type;
                 dst_bidx = 4;
-                src_cidx = data_type * fifo_level * serializers;
+                src_cidx = data_type * fifo_level;
                 dst_cidx = 0;
         } else {
                 src = prtd->params->dma_addr;
@@ -210,7 +209,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                 src_bidx = 0;
                 dst_bidx = data_type;
                 src_cidx = 0;
-                dst_cidx = data_type * fifo_level * serializers;
+                dst_cidx = data_type * fifo_level;
         }
 
         acnt = prtd->params->acnt;
@@ -225,8 +224,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                                                         ASYNC);
         else
                 edma_set_transfer_params(prtd->asp_link[0], acnt,
-                                                fifo_level * serializers,
-                                                count, fifo_level * serializers,
+                                                fifo_level,
+                                                count, fifo_level,
                                                 ABSYNC);
 }
 
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index 32d7634d7b26..b6ef7039dd09 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -27,7 +27,6 @@ struct davinci_pcm_dma_params {
         unsigned char data_type;        /* xfer data type */
         unsigned char convert_mono_stereo;
         unsigned int fifo_level;
-        unsigned char active_serializers; /* num. of active audio serializers */
 };
 
 int davinci_soc_platform_register(struct device *dev);