Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293395
b: refs/heads/master
c: f691402
h: refs/heads/master
i:
  293393: 56f8ae4
  293391: 33a1b87
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Feb 21, 2012
1 parent 3285f99 commit 0cdd5b4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e54e2f81da0aaf9e39d6f9b25fa08ce0bec9ca06
refs/heads/master: f6914024575fc3fd9773531ca74d1bcb0ddaf88f
9 changes: 0 additions & 9 deletions trunk/sound/soc/imx/imx-pcm-dma-mx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@
struct imx_pcm_runtime_data {
int period_bytes;
int periods;
int dma;
unsigned long offset;
unsigned long size;
void *buf;
int period_time;
struct dma_async_tx_descriptor *desc;
struct dma_chan *dma_chan;
struct imx_dma_data dma_data;
Expand Down Expand Up @@ -144,19 +140,14 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
return ret;
chan = iprtd->dma_chan;

iprtd->size = params_buffer_bytes(params);
iprtd->periods = params_periods(params);
iprtd->period_bytes = params_period_bytes(params);
iprtd->offset = 0;
iprtd->period_time = HZ / (params_rate(params) /
params_period_size(params));

snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);

dma_addr = runtime->dma_addr;

iprtd->buf = (unsigned int *)substream->dma_buffer.area;

iprtd->desc = chan->device->device_prep_dma_cyclic(chan, dma_addr,
iprtd->period_bytes * iprtd->periods,
iprtd->period_bytes,
Expand Down

0 comments on commit 0cdd5b4

Please sign in to comment.