| From d51199a83a2cf82a291d19ee852c44caa511427d Mon Sep 17 00:00:00 2001 |
| From: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| Date: Tue, 3 Mar 2015 13:38:14 +0200 |
| Subject: ASoC: omap-pcm: Correct dma mask |
| |
| From: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| |
| commit d51199a83a2cf82a291d19ee852c44caa511427d upstream. |
| |
| DMA_BIT_MASK of 64 is not valid dma address mask for OMAPs, it should be |
| set to 32. |
| The 64 was introduced by commit (in 2009): |
| a152ff24b978 ASoC: OMAP: Make DMA 64 aligned |
| |
| But the dma_mask and coherent_dma_mask can not be used to specify alignment. |
| |
| Fixes: a152ff24b978 (ASoC: OMAP: Make DMA 64 aligned) |
| Reported-by: Grygorii Strashko <Grygorii.Strashko@linaro.org> |
| Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/omap/omap-pcm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/soc/omap/omap-pcm.c |
| +++ b/sound/soc/omap/omap-pcm.c |
| @@ -201,7 +201,7 @@ static int omap_pcm_new(struct snd_soc_p |
| struct snd_pcm *pcm = rtd->pcm; |
| int ret; |
| |
| - ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(64)); |
| + ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); |
| if (ret) |
| return ret; |
| |
