diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2007-02-17 15:37:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-17 15:00:34 +0000 |
| commit | 48adbcf33b6087727a2db0b517c994a7ecfbeb0c (patch) | |
| tree | 55ad8f006bfedbf5b2ec5b72bc1ede7f2c3383da /arch/arm/mach-s3c2410 | |
| parent | 15e4db7b8054ac171de946b9511655446dd29b8f (diff) | |
| download | kernel_samsung_smdk4412-48adbcf33b6087727a2db0b517c994a7ecfbeb0c.zip kernel_samsung_smdk4412-48adbcf33b6087727a2db0b517c994a7ecfbeb0c.tar.gz kernel_samsung_smdk4412-48adbcf33b6087727a2db0b517c994a7ecfbeb0c.tar.bz2 | |
[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-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 6b34526..67d1ad3 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c @@ -19,9 +19,9 @@ #include <asm/dma.h> #include <asm/arch/dma.h> -#include <asm/plat-s3c24xx/dma.h> #include <asm/plat-s3c24xx/cpu.h> +#include <asm/plat-s3c24xx/dma.h> #include <asm/arch/regs-serial.h> #include <asm/arch/regs-gpio.h> @@ -147,6 +147,7 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = { static int s3c2410_dma_add(struct sys_device *sysdev) { + s3c2410_dma_init(); s3c24xx_dma_order_set(&s3c2410_dma_order); return s3c24xx_dma_init_map(&s3c2410_dma_sel); } @@ -156,12 +157,12 @@ static struct sysdev_driver s3c2410_dma_driver = { .add = s3c2410_dma_add, }; -static int __init s3c2410_dma_init(void) +static int __init s3c2410_dma_drvinit(void) { return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_dma_driver); } -arch_initcall(s3c2410_dma_init); +arch_initcall(s3c2410_dma_drvinit); #endif #if defined(CONFIG_CPU_S3C2442) @@ -170,11 +171,11 @@ static struct sysdev_driver s3c2442_dma_driver = { .add = s3c2410_dma_add, }; -static int __init s3c2442_dma_init(void) +static int __init s3c2442_dma_drvinit(void) { return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_dma_driver); } -arch_initcall(s3c2442_dma_init); +arch_initcall(s3c2442_dma_drvinit); #endif |