Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ae4dca authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus

parents eed097bd 647ab784

sound/soc/tegra/tegra20_ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);