mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

This commit is contained in:
Mark Brown 2013-11-08 10:43:19 +00:00
parent 5196e6ffc2 10227a9487
commit 3fec948ed8
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/fsl/imx-pcm-fiq.c
View File

@ -39,8 +39,6 @@ struct imx_pcm_runtime_data {
unsigned int period; unsigned int period;
int periods; int periods;
unsigned long offset; unsigned long offset;
unsigned long last_offset;
unsigned long size;
struct hrtimer hrt; struct hrtimer hrt;
int poll_time_ns; int poll_time_ns;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
@ -52,9 +50,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
struct imx_pcm_runtime_data *iprtd = struct imx_pcm_runtime_data *iprtd =
container_of(hrt, struct imx_pcm_runtime_data, hrt); container_of(hrt, struct imx_pcm_runtime_data, hrt);
struct snd_pcm_substream *substream = iprtd->substream; struct snd_pcm_substream *substream = iprtd->substream;
struct snd_pcm_runtime *runtime = substream->runtime;
struct pt_regs regs; struct pt_regs regs;
unsigned long delta;
if (!atomic_read(&iprtd->running)) if (!atomic_read(&iprtd->running))
return HRTIMER_NORESTART; return HRTIMER_NORESTART;
@ -66,19 +62,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
else else
iprtd->offset = regs.ARM_r9 & 0xffff; iprtd->offset = regs.ARM_r9 & 0xffff;
/* How much data have we transferred since the last period report? */ snd_pcm_period_elapsed(substream);
if (iprtd->offset >= iprtd->last_offset)
delta = iprtd->offset - iprtd->last_offset;
else
delta = runtime->buffer_size + iprtd->offset
- iprtd->last_offset;
/* If we've transferred at least a period then report it and
* reset our poll time */
if (delta >= iprtd->period) {
snd_pcm_period_elapsed(substream);
iprtd->last_offset = iprtd->offset;
}
hrtimer_forward_now(hrt, ns_to_ktime(iprtd->poll_time_ns)); hrtimer_forward_now(hrt, ns_to_ktime(iprtd->poll_time_ns));
@ -95,11 +79,9 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct imx_pcm_runtime_data *iprtd = runtime->private_data; struct imx_pcm_runtime_data *iprtd = runtime->private_data;
iprtd->size = params_buffer_bytes(params);
iprtd->periods = params_periods(params); iprtd->periods = params_periods(params);
iprtd->period = params_period_bytes(params) ; iprtd->period = params_period_bytes(params);
iprtd->offset = 0; iprtd->offset = 0;
iprtd->last_offset = 0;
iprtd->poll_time_ns = 1000000000 / params_rate(params) * iprtd->poll_time_ns = 1000000000 / params_rate(params) *
params_period_size(params); params_period_size(params);
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);