---

yaml --- r: 273993 b: refs/heads/master c: 6d8d492 h: refs/heads/master i: 273991: 30824c0 v: v3
git-mirror · Sep 19, 2011 · 525b803 · 525b803
1 parent d983b24
commit 525b803
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c051ab47bf3e0d35636d4772f9c0504bebe2fec
+refs/heads/master: 6d8d492ef73433ea8debfba623dc2ee4d627aa7e
diff --git a/trunk/arch/arm/mach-s3c64xx/dma.c b/trunk/arch/arm/mach-s3c64xx/dma.c
@@ -740,7 +740,7 @@ static int __init s3c64xx_dma_init(void)
 	}
 
 	/* Set all DMA configuration to be DMA, not SDMA */
-	writel(0xffffff, S3C_SYSREG(0x110));
+	writel(0xffffff, S3C64XX_SDMA_SEL);
 
 	/* Register standard DMA controllers */
 	s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000);

diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/regs-sys.h b/trunk/arch/arm/mach-s3c64xx/include/mach/regs-sys.h
@@ -21,6 +21,8 @@
 #define S3C64XX_AHB_CON1	S3C_SYSREG(0x104)
 #define S3C64XX_AHB_CON2	S3C_SYSREG(0x108)
 
+#define S3C64XX_SDMA_SEL	S3C_SYSREG(0x110)
+
 #define S3C64XX_OTHERS		S3C_SYSREG(0x900)
 
 #define S3C64XX_OTHERS_USBMASK	(1 << 16)