* [PATCH] ASoC: tegra: correct playback_dma_data setup
@ 2013-07-21 2:34 Richard Zhao
2013-07-21 3:55 ` Stephen Warren
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Richard Zhao @ 2013-07-21 2:34 UTC (permalink / raw)
To: linux-arm-kernel
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
---
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);
--
1.8.1.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ASoC: tegra: correct playback_dma_data setup
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
2013-07-21 23:57 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2013-07-21 3:55 UTC (permalink / raw)
To: linux-arm-kernel
On 07/20/2013 08:34 PM, Richard Zhao wrote:
> 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.
Acked-by: Stephen Warren <swarren@nvidia.com>
Hmm, that's what I get for only testing I2S and not SPDIF or AC'97 (not
that I can test the latter).
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: tegra: correct playback_dma_data setup
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
2013-07-21 23:57 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2013-07-21 13:02 UTC (permalink / raw)
To: linux-arm-kernel
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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: tegra: correct playback_dma_data setup
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
@ 2013-07-21 23:57 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2013-07-21 23:57 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 21, 2013 at 10:34:09AM +0800, Richard Zhao wrote:
> The errors were caused by copy/paste mistake in below commit
> since v3.10:
> 3489d50 ASoC: tegra: Use common DAI DMA data struct
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130722/7b2696ea/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-07-21 23:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2013-07-21 23:57 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).