diff options
author | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-09-22 21:20:22 +0200 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-19 10:54:32 +0100 |
commit | b10e26bc1df0682595def53486dc322f3c87feee (patch) | |
tree | 1caf3292649b7dec066120dafd6d54eeaa9de178 | |
parent | 528d9753b30ef0e8fac9220c0e98bcb98ec11282 (diff) | |
download | linux-stable-b10e26bc1df0682595def53486dc322f3c87feee.tar.gz linux-stable-b10e26bc1df0682595def53486dc322f3c87feee.tar.bz2 linux-stable-b10e26bc1df0682595def53486dc322f3c87feee.zip |
ASoC: pxa: pxa2xx-ac97: fix dma requestor lines
commit 8811191fdf7ed02ee07cb8469428158572d355a2 upstream.
PCM receive and transmit DMA requestor lines were reverted, breaking the
PCM playback interface for PXA platforms using the sound/soc/ variant
instead of the sound/arm variant.
The commit below shows the inversion in the requestor lines.
Fixes: d65a14587a9b ("ASoC: pxa: use snd_dmaengine_dai_dma_data")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index ae956e3f4b9d..593e3202fc35 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -49,7 +49,7 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { .reset = pxa2xx_ac97_cold_reset, }; -static unsigned long pxa2xx_ac97_pcm_stereo_in_req = 12; +static unsigned long pxa2xx_ac97_pcm_stereo_in_req = 11; static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_in = { .addr = __PREG(PCDR), .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, @@ -57,7 +57,7 @@ static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_in = { .filter_data = &pxa2xx_ac97_pcm_stereo_in_req, }; -static unsigned long pxa2xx_ac97_pcm_stereo_out_req = 11; +static unsigned long pxa2xx_ac97_pcm_stereo_out_req = 12; static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_out = { .addr = __PREG(PCDR), .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, |