Patchwork ASoC: tegra: correct playback_dma_data setup

login
register
mail settings
Submitter Richard Zhao
Date July 21, 2013, 2:34 a.m.
Message ID <1374374049-30732-1-git-send-email-rizhao@nvidia.com>
Download mbox | patch
Permalink /patch/260485/
State Not Applicable, archived
Headers show

Comments

Richard Zhao - July 21, 2013, 2:34 a.m.
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(-)
Stephen Warren - July 21, 2013, 3:55 a.m.
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).
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lucas Stach - July 21, 2013, 1:02 p.m.
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);


--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown - July 21, 2013, 11:57 p.m.
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.

Patch

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);