Skip to contentSkip to conversation

ASoC: tegra: correct playback_dma_data setup

PATCH In review Richard Zhao 4 participants 4 messages Jul 21, 2013 1 message not in the archive

Subsystems (3)
Sound ASoC Tegra architecture support
lore
Share & tools
lore

Richard Zhao

author
#0 lore raw

PATCH 1/1 ASoC: tegra: correct playback_dma_data setup

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 <[email protected]>
Cc Lars-Peter Clausen <lars-Qo5EllUWu/[email protected]>
Cc <[email protected]> # 3.10
---
 sound/soc/tegra/tegra20_ac97.c  | 6 +++---
 sound/soc/tegra/tegra20_spdif.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/tegra/tegra20_ac97.c +3 -3
index e58233f..6c48662 100644
@@ -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)
sound/soc/tegra/tegra20_spdif.c +2 -2
index 5eaa12c..551b3c9 100644
@@ -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);
Signature · 1 line
1.8.1.5

A message that is not in the archive (sent off-list or not yet received): 1374374049-30732-1-git-send-email-rizhao-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org

Acked-by
#2 lore raw
Quoted 5 lines · 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.

Acked-by Stephen Warren <[email protected]>

Hmm, that's what I get for only testing I2S and not SPDIF or AC'97 (not that I can test the latter).

Acked-by
#3 lore raw
In reply to a message not in the archive

Am Sonntag, den 21.07.2013, 10:34 +0800 schrieb Richard Zhao:

Quoted 9 lines

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 <[email protected]>
Cc Lars-Peter Clausen <lars-Qo5EllUWu/[email protected]>
Cc <[email protected]> # 3.10
Acked-by Lucas Stach <[email protected]>
Quoted 37 lines
---
 sound/soc/tegra/tegra20_ac97.c  | 6 +++---
 sound/soc/tegra/tegra20_spdif.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/tegra/tegra20_ac97.c +3 -3
index e58233f..6c48662 100644
@@ -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)
sound/soc/tegra/tegra20_spdif.c +2 -2
index 5eaa12c..551b3c9 100644
@@ -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);
maintainer
#4 lore raw
In reply to Richard Zhao
Quoted 3 lines · 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

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>