diff options
author | Ben Gardiner <bengardiner@nanometrics.ca> | 2011-05-24 14:50:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-25 07:14:28 -0400 |
commit | fb1e9703af618c7ae0ee43f19778264c1804a50d (patch) | |
tree | 1576a295098118d3043843a0c7296000cbc24c38 /sound/soc/davinci/davinci-pcm.c | |
parent | 23ca853392aebdaa56c8138746deb2002e03d827 (diff) |
ASoC: davinci-pcm: trivial: make ping-pong params setup symmetrical
The setup of the pong channel uses EDMA_CHAN_SLOT instead of & 0x3f as the
setup of the ping channel does.
Make the setup of ping and pong symmetric. There is no functional change
introduced by this patch.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: Steven Faludi <stevenfaludi@nanometrics.ca>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 9d35b8c1a624..0d04e0c4a148 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c | |||
@@ -425,7 +425,8 @@ static int request_ping_pong(struct snd_pcm_substream *substream, | |||
425 | 425 | ||
426 | edma_read_slot(link, &prtd->asp_params); | 426 | edma_read_slot(link, &prtd->asp_params); |
427 | prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f) | TCINTEN); | 427 | prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f) | TCINTEN); |
428 | prtd->asp_params.opt |= TCCHEN | EDMA_TCC(prtd->ram_channel & 0x3f); | 428 | prtd->asp_params.opt |= TCCHEN | |
429 | EDMA_TCC(prtd->ram_channel & 0x3f); | ||
429 | edma_write_slot(link, &prtd->asp_params); | 430 | edma_write_slot(link, &prtd->asp_params); |
430 | 431 | ||
431 | /* pong */ | 432 | /* pong */ |
@@ -439,7 +440,7 @@ static int request_ping_pong(struct snd_pcm_substream *substream, | |||
439 | prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f)); | 440 | prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f)); |
440 | /* interrupt after every pong completion */ | 441 | /* interrupt after every pong completion */ |
441 | prtd->asp_params.opt |= TCINTEN | TCCHEN | | 442 | prtd->asp_params.opt |= TCINTEN | TCCHEN | |
442 | EDMA_TCC(EDMA_CHAN_SLOT(prtd->ram_channel)); | 443 | EDMA_TCC(prtd->ram_channel & 0x3f); |
443 | edma_write_slot(link, &prtd->asp_params); | 444 | edma_write_slot(link, &prtd->asp_params); |
444 | 445 | ||
445 | /* ram */ | 446 | /* ram */ |