From bcd452f7b15d81f2594929ff5d19f36154e08c16 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Sat, 6 Jun 2020 23:04:58 +0530 Subject: [PATCH] ASoC: tegra: propagate slave_id info to DMA engine ADMAIF default channel FIFO size is different depending on Tegra210 and Tegra186 (and later). There is a guideline from HW that FIFO size of ADMAIF channel should be same as the corrpsonding mapped DMA channel. Commit 8c0d5ea47d21 ("dmaengine: tegra210-adma: override ADMA FIFO size") updates FIFO size based on 'slave_id' info. Current patch passes the 'slave_id' information to DMA engine. Following are the original commits from where the changes have been manually cherry picked. - commit 34aa1f405069 ("ASoC: tegra-alt: T210 AHUB drivers") - commit 938afdfeea42 ("ASoC: tegra-alt: Alternative DAPM-based driver") Also updated copyright info for Tegra PCM driver. Bug 2845498 Change-Id: I6c748b94544bc22c21a43b731e43862592047c09 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/c/linux-5.9/+/2356716 Reviewed-by: automaticguardword Reviewed-by: Sharad Gupta Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- sound/soc/tegra/tegra210_admaif.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index 8009b6cc..d3f25a3e 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -1097,6 +1097,7 @@ static int tegra_admaif_probe(struct platform_device *pdev) CH_RX_REG(TEGRA_ADMAIF_RX_FIFO_READ, i); admaif->playback_dma_data[i].addr_width = 32; + admaif->playback_dma_data[i].slave_id = i + 1; if (of_property_read_string_index(pdev->dev.of_node, "dma-names", (i * 2) + 1, @@ -1108,6 +1109,7 @@ static int tegra_admaif_probe(struct platform_device *pdev) } admaif->capture_dma_data[i].addr_width = 32; + admaif->capture_dma_data[i].slave_id = i + 1; if (of_property_read_string_index(pdev->dev.of_node, "dma-names",