diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-08 11:33:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-11 09:32:43 -0500 |
commit | 2f757f2ab7411cf0e2779012d8cda0cbf2f80d26 (patch) | |
tree | 880e0c661948132d54ce238eb45cba9bb71314d4 /arch/arm/mach-footbridge/dma.c | |
parent | 3afb6e9c635f735c751148beddc195daec0e35ec (diff) |
[ARM] dma: rejig DMA initialization
Rather than having the central DMA multiplexer call the architecture
specific DMA initialization function, have each architecture DMA
initialization function use core_initcall(), and register each DMA
channel separately with the multiplexer.
This removes the array of dma structures in the central multiplexer,
replacing it with an array of pointers instead; this is more flexible
since it allows the drivers to wrap the DMA structure (eventually
allowing us to transition non-ISA DMA drivers away.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge/dma.c')
-rw-r--r-- | arch/arm/mach-footbridge/dma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index e7b8a6adaf7a..fdd94b182d78 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c | |||
@@ -41,7 +41,7 @@ static struct dma_ops fb_dma_ops = { | |||
41 | }; | 41 | }; |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | void __init arch_dma_init(dma_t *dma) | 44 | static int __init fb_dma_init(void) |
45 | { | 45 | { |
46 | #if 0 | 46 | #if 0 |
47 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; | 47 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; |
@@ -49,6 +49,8 @@ void __init arch_dma_init(dma_t *dma) | |||
49 | #endif | 49 | #endif |
50 | #ifdef CONFIG_ISA_DMA | 50 | #ifdef CONFIG_ISA_DMA |
51 | if (footbridge_cfn_mode()) | 51 | if (footbridge_cfn_mode()) |
52 | isa_init_dma(dma + _ISA_DMA(0)); | 52 | isa_init_dma(); |
53 | #endif | 53 | #endif |
54 | return 0; | ||
54 | } | 55 | } |
56 | core_initcall(fb_dma_init); | ||