lkml.org 
[lkml]   [2015]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 084/221] ASoC: omap-pcm: Correct dma mask
    3.2.69-rc1 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>
    [bwh: Backported to 3.2: not using dma_coerce_mask_and_coherent()]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -333,7 +333,7 @@ static struct snd_pcm_ops omap_pcm_ops =
    .mmap = omap_pcm_mmap,
    };

    -static u64 omap_pcm_dmamask = DMA_BIT_MASK(64);
    +static u64 omap_pcm_dmamask = DMA_BIT_MASK(32);

    static int omap_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
    int stream)
    @@ -385,7 +385,7 @@ static int omap_pcm_new(struct snd_soc_p
    if (!card->dev->dma_mask)
    card->dev->dma_mask = &omap_pcm_dmamask;
    if (!card->dev->coherent_dma_mask)
    - card->dev->coherent_dma_mask = DMA_BIT_MASK(64);
    + card->dev->coherent_dma_mask = DMA_BIT_MASK(32);

    if (dai->driver->playback.channels_min) {
    ret = omap_pcm_preallocate_dma_buffer(pcm,


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