aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-02-17 15:37:14 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-17 15:00:34 +0000
commit48adbcf33b6087727a2db0b517c994a7ecfbeb0c (patch)
tree55ad8f006bfedbf5b2ec5b72bc1ede7f2c3383da /arch/arm/mach-s3c2440
parent15e4db7b8054ac171de946b9511655446dd29b8f (diff)
[ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
This patch gets the DMA system for the S3C24XX ready for the S3C2443, which requires 6 dma channels at a different stride, and different base IRQ. The DMA system is now initialised from the same drivers which apply the DMA mappings, as well as removing the DMA sysdev intialisation out of the main init code (which is now being called from a sysdev probe, so cannot add a new sysdev) Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/dma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c
index 2bb2926554c..cd035a3ec87 100644
--- a/arch/arm/mach-s3c2440/dma.c
+++ b/arch/arm/mach-s3c2440/dma.c
@@ -19,8 +19,8 @@
#include <asm/dma.h>
#include <asm/arch/dma.h>
-#include <asm/plat-s3c24xx/dma.h>
+#include <asm/plat-s3c24xx/dma.h>
#include <asm/plat-s3c24xx/cpu.h>
#include <asm/arch/regs-serial.h>
@@ -192,6 +192,7 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = {
static int s3c2440_dma_add(struct sys_device *sysdev)
{
+ s3c2410_dma_init();
s3c24xx_dma_order_set(&s3c2440_dma_order);
return s3c24xx_dma_init_map(&s3c2440_dma_sel);
}