← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/soc/kirkwood/kirkwood-dma.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/kirkwood/kirkwood-dma.c
132
132
        priv = snd_soc_dai_get_dma_data(cpu_dai, substream);
133
133
        snd_soc_set_runtime_hwparams(substream, &kirkwood_dma_snd_hw);
134
134
 
135
 
        /* Ensure that all constraints linked to dma burst are fullfilled */
 
135
        /* Ensure that all constraints linked to dma burst are fulfilled */
136
136
        err = snd_pcm_hw_constraint_minmax(runtime,
137
137
                        SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
138
138
                        priv->burst * 2,
170
170
 
171
171
                /*
172
172
                 * Enable Error interrupts. We're only ack'ing them but
173
 
                 * it's usefull for diagnostics
 
173
                 * it's useful for diagnostics
174
174
                 */
175
175
                writel((unsigned long)-1, priv->io + KIRKWOOD_ERR_MASK);
176
176
        }
312
312
        return 0;
313
313
}
314
314
 
315
 
static int kirkwood_dma_new(struct snd_card *card,
316
 
                struct snd_soc_dai *dai, struct snd_pcm *pcm)
 
315
static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
317
316
{
 
317
        struct snd_card *card = rtd->card->snd_card;
 
318
        struct snd_soc_dai *dai = rtd->cpu_dai;
 
319
        struct snd_pcm *pcm = rtd->pcm;
318
320
        int ret;
319
321
 
320
322
        if (!card->dev->dma_mask)