diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-08 03:26:43 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:12:56 -0400 |
commit | 87f3dd77974cba1ba0798abd741ede50f56b3eb3 (patch) | |
tree | 9f89bf77ac4ddc919a91b438d061849314ea5049 /sound/arm | |
parent | cbd18f8e3de62f91001963467ab6aad80a2a25ac (diff) |
[ARM] pxa: simplify DMA register definitions
1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and
pass DRCMR index by "struct resource" if possible
2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use
DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/arm')
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 199cca3366df..714b3baa4be7 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -215,7 +215,7 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { | |||
215 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { | 215 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { |
216 | .name = "AC97 PCM out", | 216 | .name = "AC97 PCM out", |
217 | .dev_addr = __PREG(PCDR), | 217 | .dev_addr = __PREG(PCDR), |
218 | .drcmr = &DRCMRTXPCDR, | 218 | .drcmr = &DRCMR(12), |
219 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | 219 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | |
220 | DCMD_BURST32 | DCMD_WIDTH4, | 220 | DCMD_BURST32 | DCMD_WIDTH4, |
221 | }; | 221 | }; |
@@ -223,7 +223,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { | |||
223 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = { | 223 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = { |
224 | .name = "AC97 PCM in", | 224 | .name = "AC97 PCM in", |
225 | .dev_addr = __PREG(PCDR), | 225 | .dev_addr = __PREG(PCDR), |
226 | .drcmr = &DRCMRRXPCDR, | 226 | .drcmr = &DRCMR(11), |
227 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | 227 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | |
228 | DCMD_BURST32 | DCMD_WIDTH4, | 228 | DCMD_BURST32 | DCMD_WIDTH4, |
229 | }; | 229 | }; |