From: dev@lynxeye.de (Lucas Stach)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ASoC: tegra: correct playback_dma_data setup
Date: Sun, 21 Jul 2013 15:02:29 +0200 [thread overview]
Message-ID: <1374411749.1633.1.camel@tellur> (raw)
In-Reply-To: <1374374049-30732-1-git-send-email-rizhao@nvidia.com>
Am Sonntag, den 21.07.2013, 10:34 +0800 schrieb Richard Zhao:
> 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>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: <stable@vger.kernel.org> # 3.10
Acked-by: Lucas Stach <dev@lynxeye.de>
> ---
> sound/soc/tegra/tegra20_ac97.c | 6 +++---
> sound/soc/tegra/tegra20_spdif.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
> index e58233f..6c48662 100644
> --- a/sound/soc/tegra/tegra20_ac97.c
> +++ b/sound/soc/tegra/tegra20_ac97.c
> @@ -389,9 +389,9 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
> 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 = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
> if (ret)
> diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
> index 5eaa12c..551b3c9 100644
> --- a/sound/soc/tegra/tegra20_spdif.c
> +++ b/sound/soc/tegra/tegra20_spdif.c
> @@ -323,8 +323,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
> }
>
> 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);
next prev parent reply other threads:[~2013-07-21 13:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-21 2:34 [PATCH] ASoC: tegra: correct playback_dma_data setup Richard Zhao
2013-07-21 3:55 ` Stephen Warren
2013-07-21 13:02 ` Lucas Stach [this message]
2013-07-21 23:57 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374411749.1633.1.camel@tellur \
--to=dev@lynxeye.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox