diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-05-09 16:47:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-13 11:54:11 +0100 |
| commit | dfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1 (patch) | |
| tree | 5ce76f2ffdd76ad3f3ba8a892c43495effd90507 /sound/soc/intel/sst-baytrail-pcm.c | |
| parent | 6fb8b02b4be5fa41e39a26fc11b8093518713e30 (diff) | |
| download | op-kernel-dev-dfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1.zip op-kernel-dev-dfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1.tar.gz | |
ASoC: Intel: Use ACPI device for Baytrail PCM buffer allocation
This follows the same idea than commit 10df350977b1
("ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled.") by using only
ACPI device for all DMA allocations. Since DMA masking is already done in
firmware loading it can be removed from here.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/sst-baytrail-pcm.c')
| -rw-r--r-- | sound/soc/intel/sst-baytrail-pcm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c index 00a2118..0afb349 100644 --- a/sound/soc/intel/sst-baytrail-pcm.c +++ b/sound/soc/intel/sst-baytrail-pcm.c @@ -319,18 +319,16 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd) { struct snd_pcm *pcm = rtd->pcm; size_t size; + struct snd_soc_platform *platform = rtd->platform; + struct sst_pdata *pdata = dev_get_platdata(platform->dev); int ret = 0; - ret = dma_coerce_mask_and_coherent(rtd->card->dev, DMA_BIT_MASK(32)); - if (ret) - return ret; - if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream || pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { size = sst_byt_pcm_hardware.buffer_bytes_max; ret = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, - rtd->card->dev, + pdata->dma_dev, size, size); if (ret) { dev_err(rtd->dev, "dma buffer allocation failed %d\n", |
