diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2007-06-22 05:40:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 14:28:16 +0100 |
| commit | f53f066c25036210036730d64c876ea586114425 (patch) | |
| tree | e680deb53ff12ec09f5c64421a3f13eecb7aed41 /arch/arm/mach-pxa/pxa27x.c | |
| parent | cd49104d99b56383a3b1fdce2f31018197093c31 (diff) | |
[ARM] 4451/1: pxa: make dma.c generic and remove cpu specific dma code
Since the number of dma channels varies between pxa25x and pxa27x, it
introduces some specific code in dma.c. This patch moves the specific
code to pxa25x.c and pxa27x.c and makes dma.c more generic.
1. add pxa_init_dma() for dma initialization, the number of channels
are passed in by the argument
2. add a "prio" field to the "struct pxa_dma_channel" for the channel
priority, and is initialized in pxa_init_dma()
3. use a general priority comparison with the channels "prio" field so
to remove the processor specific pxa_for_each_dma_prio macro, this
is not lightning fast as the original one, but it is acceptable as
it happens when requesting dma, which is usually not so performance
critical
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 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 1407985c8ab0..5b819e2c5563 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -23,6 +23,7 @@ #include <asm/arch/pxa-regs.h> #include <asm/arch/ohci.h> #include <asm/arch/pm.h> +#include <asm/arch/dma.h> #include "generic.h" @@ -214,6 +215,8 @@ static int __init pxa27x_init(void) { int ret = 0; if (cpu_is_pxa27x()) { + if ((ret = pxa_init_dma(32))) + return ret; #ifdef CONFIG_PM pm_set_ops(&pxa27x_pm_ops); #endif |