lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 034/156] ASoC: omap-pcm: Correct dma mask
    Date
    3.13.11-ckt19 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/soc/omap/omap-pcm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
    index b8fa986..01d59d0 100644
    --- a/sound/soc/omap/omap-pcm.c
    +++ b/sound/soc/omap/omap-pcm.c
    @@ -202,7 +202,7 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
    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;

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-04-08 01:21    [W:4.140 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site