lkml.org 
[lkml]   [2013]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 12/99] ASoC: tegra: correct playback_dma_data setup
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Richard Zhao <rizhao@nvidia.com>

    commit 647ab784c507763bfda79155f125b6edd1244806 upstream.

    The errors were caused by copy/paste mistake in below commit
    since v3.10:
    3489d50 ASoC: tegra: Use common DAI DMA data struct

    It also corrects slave_id initialization in tegra20_ac97 driver.

    Signed-off-by: Richard Zhao <rizhao@nvidia.com>
    Acked-by: Stephen Warren <swarren@nvidia.com>
    Acked-by: Lucas Stach <dev@lynxeye.de>
    Signed-off-by: Mark Brown <broonie@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/tegra/tegra20_ac97.c | 6 +++---
    sound/soc/tegra/tegra20_spdif.c | 4 ++--
    2 files changed, 5 insertions(+), 5 deletions(-)

    --- a/sound/soc/tegra/tegra20_ac97.c
    +++ b/sound/soc/tegra/tegra20_ac97.c
    @@ -399,9 +399,9 @@ static int tegra20_ac97_platform_probe(s
    ac97->capture_dma_data.slave_id = of_dma[1];

    ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1;
    - ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
    - ac97->capture_dma_data.maxburst = 4;
    - ac97->capture_dma_data.slave_id = of_dma[0];
    + ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
    + ac97->playback_dma_data.maxburst = 4;
    + ac97->playback_dma_data.slave_id = of_dma[1];

    ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
    &tegra20_ac97_dai, 1);
    --- a/sound/soc/tegra/tegra20_spdif.c
    +++ b/sound/soc/tegra/tegra20_spdif.c
    @@ -323,8 +323,8 @@ static int tegra20_spdif_platform_probe(
    }

    spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT;
    - spdif->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
    - spdif->capture_dma_data.maxburst = 4;
    + spdif->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
    + spdif->playback_dma_data.maxburst = 4;
    spdif->playback_dma_data.slave_id = dmareq->start;

    pm_runtime_enable(&pdev->dev);



    \
     
     \ /
      Last update: 2013-08-02 14:01    [W:2.057 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site