lkml.org 
[lkml]   [2011]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[034/105] ASoC: imx: set watermarks for mx2-dma
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

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

    From: Wolfram Sang <w.sang@pengutronix.de>

    commit 2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b upstream.

    They got accidently removed by f0fba2a (ASoC: multi-component - ASoC
    Multi-Component Support). Reintroduce them and get rid of the
    superfluous defines because the fiq-driver has its own hardcoded values.

    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Liam Girdwood <lrg@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/soc/imx/imx-pcm-dma-mx2.c | 5 +++++
    sound/soc/imx/imx-ssi.h | 3 ---
    2 files changed, 5 insertions(+), 3 deletions(-)

    --- a/sound/soc/imx/imx-pcm-dma-mx2.c
    +++ b/sound/soc/imx/imx-pcm-dma-mx2.c
    @@ -303,6 +303,11 @@ static struct snd_soc_platform_driver im

    static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
    {
    + struct imx_ssi *ssi = platform_get_drvdata(pdev);
    +
    + ssi->dma_params_tx.burstsize = 6;
    + ssi->dma_params_rx.burstsize = 4;
    +
    return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);
    }

    --- a/sound/soc/imx/imx-ssi.h
    +++ b/sound/soc/imx/imx-ssi.h
    @@ -234,7 +234,4 @@ void imx_pcm_free(struct snd_pcm *pcm);
    */
    #define IMX_SSI_DMABUF_SIZE (64 * 1024)

    -#define DMA_RXFIFO_BURST 0x4
    -#define DMA_TXFIFO_BURST 0x6
    -
    #endif /* _IMX_SSI_H */



    \
     
     \ /
      Last update: 2011-04-12 16:41    [W:0.021 / U:214.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site