From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: Re: [PATCH] ASoC: tegra: correct playback_dma_data setup Date: Sun, 21 Jul 2013 15:02:29 +0200 Message-ID: <1374411749.1633.1.camel@tellur> References: <1374374049-30732-1-git-send-email-rizhao@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1374374049-30732-1-git-send-email-rizhao-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Richard Zhao Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, perex-/Fr2/VpizcU@public.gmane.org, tiwai-l3A5Bk7waGM@public.gmane.org, swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org 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 > Cc: Lars-Peter Clausen > Cc: # 3.10 Acked-by: Lucas Stach > --- > 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);