aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2009-03-19 11:02:34 -0400
committerBen Dooks <ben-linux@fluff.org>2009-05-01 06:39:06 -0400
commit8970ef47d56fd3db28ee798b9d400caf08abd924 (patch)
treecd400b68549e3f6494d1f339d3e3c8b7bacad4dc /arch/arm/mach-s3c2410
parent5a9eb8da8b95fce21eb2dd39fe71b2b7882ce89a (diff)
[ARM] S3C24XX: Remove hardware specific registers from DMA
calls The S3C24XX DMA API channel configuration registers are being passed values comprised of register values which makes it hard to move the API to cover both the S3C24XX and S3C64XX. These values can be calculated from knowing which device the channel is connected to, so remove them from the two calls s3c2410_dma_config and s3c2410_dma_devconfig. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/dma.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index 13358ce2128c..acaef6784e95 100644
--- a/arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -206,10 +206,10 @@ struct s3c2410_dma_chan {
206 206
207 /* channel configuration */ 207 /* channel configuration */
208 enum s3c2410_dmasrc source; 208 enum s3c2410_dmasrc source;
209 enum dma_ch req_ch;
209 unsigned long dev_addr; 210 unsigned long dev_addr;
210 unsigned long load_timeout; 211 unsigned long load_timeout;
211 unsigned int flags; /* channel flags */ 212 unsigned int flags; /* channel flags */
212 unsigned int hw_cfg; /* last hw config */
213 213
214 struct s3c24xx_dma_map *map; /* channel hw maps */ 214 struct s3c24xx_dma_map *map; /* channel hw maps */
215 215
@@ -290,7 +290,7 @@ extern int s3c2410_dma_enqueue(unsigned int channel, void *id,
290 * configure the dma channel 290 * configure the dma channel
291*/ 291*/
292 292
293extern int s3c2410_dma_config(unsigned int channel, int xferunit, int dcon); 293extern int s3c2410_dma_config(unsigned int channel, int xferunit);
294 294
295/* s3c2410_dma_devconfig 295/* s3c2410_dma_devconfig
296 * 296 *
@@ -298,7 +298,7 @@ extern int s3c2410_dma_config(unsigned int channel, int xferunit, int dcon);
298*/ 298*/
299 299
300extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source, 300extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source,
301 int hwcfg, unsigned long devaddr); 301 unsigned long devaddr);
302 302
303/* s3c2410_dma_getposition 303/* s3c2410_dma_getposition
304 * 304 *