aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r--sound/soc/davinci/davinci-pcm.c11
1 files changed, 5 insertions, 6 deletions
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)
181 unsigned short acnt; 181 unsigned short acnt;
182 unsigned int count; 182 unsigned int count;
183 unsigned int fifo_level; 183 unsigned int fifo_level;
184 unsigned char serializers = prtd->params->active_serializers;
185 184
186 period_size = snd_pcm_lib_period_bytes(substream); 185 period_size = snd_pcm_lib_period_bytes(substream);
187 dma_offset = prtd->period * period_size; 186 dma_offset = prtd->period * period_size;
@@ -195,14 +194,14 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
195 data_type = prtd->params->data_type; 194 data_type = prtd->params->data_type;
196 count = period_size / data_type; 195 count = period_size / data_type;
197 if (fifo_level) 196 if (fifo_level)
198 count /= fifo_level * serializers; 197 count /= fifo_level;
199 198
200 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { 199 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
201 src = dma_pos; 200 src = dma_pos;
202 dst = prtd->params->dma_addr; 201 dst = prtd->params->dma_addr;
203 src_bidx = data_type; 202 src_bidx = data_type;
204 dst_bidx = 4; 203 dst_bidx = 4;
205 src_cidx = data_type * fifo_level * serializers; 204 src_cidx = data_type * fifo_level;
206 dst_cidx = 0; 205 dst_cidx = 0;
207 } else { 206 } else {
208 src = prtd->params->dma_addr; 207 src = prtd->params->dma_addr;
@@ -210,7 +209,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
210 src_bidx = 0; 209 src_bidx = 0;
211 dst_bidx = data_type; 210 dst_bidx = data_type;
212 src_cidx = 0; 211 src_cidx = 0;
213 dst_cidx = data_type * fifo_level * serializers; 212 dst_cidx = data_type * fifo_level;
214 } 213 }
215 214
216 acnt = prtd->params->acnt; 215 acnt = prtd->params->acnt;
@@ -225,8 +224,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
225 ASYNC); 224 ASYNC);
226 else 225 else
227 edma_set_transfer_params(prtd->asp_link[0], acnt, 226 edma_set_transfer_params(prtd->asp_link[0], acnt,
228 fifo_level * serializers, 227 fifo_level,
229 count, fifo_level * serializers, 228 count, fifo_level,
230 ABSYNC); 229 ABSYNC);
231} 230}
232 231