aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-09-15 18:46:20 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 05:25:19 -0400
commit3fc3a25ba47735296984ddbb2e6ba504017ec3e1 (patch)
tree1d863539f440805e761a24b7cb5578a1f0178325
parent98c418a002ce5f3110eeb31d1ce8261f5199997d (diff)
[ARM] 3799/1: S3C2442: DMA channel mappings
DMA channel mappings for the S3C2442 Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-s3c2410/Kconfig7
-rw-r--r--arch/arm/mach-s3c2410/Makefile2
-rw-r--r--arch/arm/mach-s3c2410/s3c2410-dma.c15
3 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index bbd138be6a70..61a359c4aa47 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -133,6 +133,13 @@ config S3C2410_CLOCK
133 help 133 help
134 Clock code for the S3C2410, and similar processors 134 Clock code for the S3C2410, and similar processors
135 135
136config CPU_S3C2410_DMA
137 bool
138 depends on S3C2410_DMA && (CPU_S3C2410 || CPU_S3C2442)
139 default y if CPU_S3C2410 || CPU_S3C2442
140 help
141 DMA device selection for S3C2410 and compatible CPUs
142
136config CPU_S3C2410 143config CPU_S3C2410
137 bool 144 bool
138 depends on ARCH_S3C2410 145 depends on ARCH_S3C2410
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 129e037c037d..a3509052f435 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_CPU_S3C2400) += s3c2400-gpio.o
22 22
23obj-$(CONFIG_CPU_S3C2410) += s3c2410.o 23obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
24obj-$(CONFIG_CPU_S3C2410) += s3c2410-gpio.o 24obj-$(CONFIG_CPU_S3C2410) += s3c2410-gpio.o
25obj-dma-$(CONFIG_CPU_S3C2410) += s3c2410-dma.o 25obj-$(CONFIG_CPU_S3C2410_DMA) += s3c2410-dma.o
26 26
27# Power Management support 27# Power Management support
28 28
diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c b/arch/arm/mach-s3c2410/s3c2410-dma.c
index 91bc169fc25e..51e5098b32e8 100644
--- a/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -141,3 +141,18 @@ static int __init s3c2410_dma_init(void)
141} 141}
142 142
143arch_initcall(s3c2410_dma_init); 143arch_initcall(s3c2410_dma_init);
144
145/* S3C2442 DMA contains the same selection table as the S3C2410 */
146
147static struct sysdev_driver s3c2442_dma_driver = {
148 .add = s3c2410_dma_add,
149};
150
151static int __init s3c2442_dma_init(void)
152{
153 return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_dma_driver);
154}
155
156arch_initcall(s3c2442_dma_init);
157
158