From 3d1eab2c450aef9648c69615590e21698b1450d5 Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko@sntech.de>
Date: Tue, 24 Apr 2012 18:06:53 -0700
Subject: [PATCH] --- yaml --- r: 308403 b: refs/heads/master c:
 ad6c1d43964dcba57bfe20b7185af5a71f94a1b7 h: refs/heads/master i:   308401:
 ec054e1a54a0928b43dc1ab154b7b9ff31410bbc   308399:
 81bc81ec0b902178d7e7790c493fa37e0eab8a0e v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/arm/mach-s3c24xx/dma-s3c2443.c      | 16 ++++++++++++----
 trunk/arch/arm/mach-s3c24xx/include/mach/dma.h |  4 ++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 58913ee6b031..113efd9d67fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d25a8f940c477dc8ed5893d7366a63dba53b0b19
+refs/heads/master: ad6c1d43964dcba57bfe20b7185af5a71f94a1b7
diff --git a/trunk/arch/arm/mach-s3c24xx/dma-s3c2443.c b/trunk/arch/arm/mach-s3c24xx/dma-s3c2443.c
index e227c472a40a..2d94228d2866 100644
--- a/trunk/arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/trunk/arch/arm/mach-s3c24xx/dma-s3c2443.c
@@ -55,12 +55,20 @@ static struct s3c24xx_dma_map __initdata s3c2443_dma_mappings[] = {
 		.name		= "sdi",
 		.channels	= MAP(S3C2443_DMAREQSEL_SDI),
 	},
-	[DMACH_SPI0] = {
-		.name		= "spi0",
+	[DMACH_SPI0_RX] = {
+		.name		= "spi0-rx",
+		.channels	= MAP(S3C2443_DMAREQSEL_SPI0RX),
+	},
+	[DMACH_SPI0_TX] = {
+		.name		= "spi0-tx",
 		.channels	= MAP(S3C2443_DMAREQSEL_SPI0TX),
 	},
-	[DMACH_SPI1] = { /* only on S3C2443/S3C2450 */
-		.name		= "spi1",
+	[DMACH_SPI1_RX] = { /* only on S3C2443/S3C2450 */
+		.name		= "spi1-rx",
+		.channels	= MAP(S3C2443_DMAREQSEL_SPI1RX),
+	},
+	[DMACH_SPI1_TX] = { /* only on S3C2443/S3C2450 */
+		.name		= "spi1-tx",
 		.channels	= MAP(S3C2443_DMAREQSEL_SPI1TX),
 	},
 	[DMACH_UART0] = {
diff --git a/trunk/arch/arm/mach-s3c24xx/include/mach/dma.h b/trunk/arch/arm/mach-s3c24xx/include/mach/dma.h
index acbdfecd4186..454831b66037 100644
--- a/trunk/arch/arm/mach-s3c24xx/include/mach/dma.h
+++ b/trunk/arch/arm/mach-s3c24xx/include/mach/dma.h
@@ -47,6 +47,10 @@ enum dma_ch {
 	DMACH_UART2_SRC2,
 	DMACH_UART3,		/* s3c2443 has extra uart */
 	DMACH_UART3_SRC2,
+	DMACH_SPI0_TX,		/* s3c2443/2416/2450 hsspi0 */
+	DMACH_SPI0_RX,		/* s3c2443/2416/2450 hsspi0 */
+	DMACH_SPI1_TX,		/* s3c2443/2450 hsspi1 */
+	DMACH_SPI1_RX,		/* s3c2443/2450 hsspi1 */
 	DMACH_MAX,		/* the end entry */
 };