diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:11 -0400 |
commit | c5ae4dca11523dff15cfb1763b64a71b805976aa (patch) | |
tree | 8845c007789f4b19f9d12804dd161589de1facb7 | |
parent | eed097bd087135fe57471f8815ed1a569bc8260e (diff) | |
parent | 647ab784c507763bfda79155f125b6edd1244806 (diff) |
Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus
-rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 6 | ||||
-rw-r--r-- | 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 e58233f7df61..6c486625321b 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) | |||
389 | ac97->capture_dma_data.slave_id = of_dma[1]; | 389 | ac97->capture_dma_data.slave_id = of_dma[1]; |
390 | 390 | ||
391 | ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1; | 391 | ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1; |
392 | ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 392 | ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
393 | ac97->capture_dma_data.maxburst = 4; | 393 | ac97->playback_dma_data.maxburst = 4; |
394 | ac97->capture_dma_data.slave_id = of_dma[0]; | 394 | ac97->playback_dma_data.slave_id = of_dma[1]; |
395 | 395 | ||
396 | ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); | 396 | ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); |
397 | if (ret) | 397 | if (ret) |
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 5eaa12cdc6eb..551b3c93ce93 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) | |||
323 | } | 323 | } |
324 | 324 | ||
325 | spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT; | 325 | spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT; |
326 | spdif->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 326 | spdif->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
327 | spdif->capture_dma_data.maxburst = 4; | 327 | spdif->playback_dma_data.maxburst = 4; |
328 | spdif->playback_dma_data.slave_id = dmareq->start; | 328 | spdif->playback_dma_data.slave_id = dmareq->start; |
329 | 329 | ||
330 | pm_runtime_enable(&pdev->dev); | 330 | pm_runtime_enable(&pdev->dev); |