From f41e66922ce83de3c03d3d30fb074e818fc059f9 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Fri, 15 Sep 2006 23:46:20 +0100
Subject: [PATCH] --- yaml --- r: 36568 b: refs/heads/master c:
 3fc3a25ba47735296984ddbb2e6ba504017ec3e1 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/mach-s3c2410/Kconfig       |  7 +++++++
 trunk/arch/arm/mach-s3c2410/Makefile      |  2 +-
 trunk/arch/arm/mach-s3c2410/s3c2410-dma.c | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 35e11b36464d..1d798e74fcb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98c418a002ce5f3110eeb31d1ce8261f5199997d
+refs/heads/master: 3fc3a25ba47735296984ddbb2e6ba504017ec3e1
diff --git a/trunk/arch/arm/mach-s3c2410/Kconfig b/trunk/arch/arm/mach-s3c2410/Kconfig
index bbd138be6a70..61a359c4aa47 100644
--- a/trunk/arch/arm/mach-s3c2410/Kconfig
+++ b/trunk/arch/arm/mach-s3c2410/Kconfig
@@ -133,6 +133,13 @@ config S3C2410_CLOCK
 	help
 	  Clock code for the S3C2410, and similar processors
 
+config CPU_S3C2410_DMA
+	bool
+	depends on S3C2410_DMA && (CPU_S3C2410 || CPU_S3C2442)
+	default y if CPU_S3C2410 || CPU_S3C2442
+	help
+	  DMA device selection for S3C2410 and compatible CPUs
+
 config CPU_S3C2410
 	bool
 	depends on ARCH_S3C2410
diff --git a/trunk/arch/arm/mach-s3c2410/Makefile b/trunk/arch/arm/mach-s3c2410/Makefile
index 129e037c037d..a3509052f435 100644
--- a/trunk/arch/arm/mach-s3c2410/Makefile
+++ b/trunk/arch/arm/mach-s3c2410/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_CPU_S3C2400)	+= s3c2400-gpio.o
 
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410-gpio.o
-obj-dma-$(CONFIG_CPU_S3C2410)	+= s3c2410-dma.o
+obj-$(CONFIG_CPU_S3C2410_DMA)	+= s3c2410-dma.o
 
 # Power Management support
 
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c b/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
index 91bc169fc25e..51e5098b32e8 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -141,3 +141,18 @@ static int __init s3c2410_dma_init(void)
 }
 
 arch_initcall(s3c2410_dma_init);
+
+/* S3C2442 DMA contains the same selection table as the S3C2410 */
+
+static struct sysdev_driver s3c2442_dma_driver = {
+	.add	= s3c2410_dma_add,
+};
+
+static int __init s3c2442_dma_init(void)
+{
+	return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_dma_driver);
+}
+
+arch_initcall(s3c2442_dma_init);
+
+