From abdec71e97e04dd875f918fe7db5af716ea8dc6d Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 9 Nov 2009 23:52:34 +0000
Subject: [PATCH] --- yaml --- r: 168415 b: refs/heads/master c:
 2ce672e4f49e7b69a90948f6d06c682154bbcc3b h: refs/heads/master i:   168413:
 98ab463470302d9ae32511a9b4c914c592ee8494   168411:
 5ebbd80e08c241462fc1f42f61fa6833d9822086   168407:
 4250d3966fd220766a74b533bb14e2d671fcd59c   168399:
 bb52cdba663ed5f04f00e08ddbf3c62ab0f1ba82   168383:
 ee0f55adc161087d0eb27dc91912578fb891f74c v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/arm/mach-s3c6400/include/mach/dma.h | 12 ++----------
 trunk/arch/arm/mach-s3c6410/Kconfig            |  1 +
 trunk/arch/arm/mach-s3c6410/mach-smdk6410.c    |  3 +++
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 81bf3f793604..53de49336625 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 336b1a3181d81db85c0af3d0c18fe0a04b4d5126
+refs/heads/master: 2ce672e4f49e7b69a90948f6d06c682154bbcc3b
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/dma.h b/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
index 004edab23954..6723860748be 100644
--- a/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
+++ b/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
@@ -58,21 +58,13 @@ enum dma_ch {
 	DMACH_MAX		/* the end */
 };
 
-static __inline__ int s3c_dma_has_circular(void)
+static __inline__ bool s3c_dma_has_circular(void)
 {
-	/* we will be supporting ciruclar buffers as soon as we have DMA
-	 * engine support.
-	 */
-	return 1;
+	return true;
 }
 
 #define S3C2410_DMAF_CIRCULAR		(1 << 0)
 
-static inline bool s3c_dma_has_circular(void)
-{
-	return false;
-}
-
 #include <plat/dma.h>
 
 #endif /* __ASM_ARCH_IRQ_H */
diff --git a/trunk/arch/arm/mach-s3c6410/Kconfig b/trunk/arch/arm/mach-s3c6410/Kconfig
index 53fc3ff657f7..72d4b11b2077 100644
--- a/trunk/arch/arm/mach-s3c6410/Kconfig
+++ b/trunk/arch/arm/mach-s3c6410/Kconfig
@@ -77,6 +77,7 @@ config SMDK6410_WM1190_EV1
 	depends on MACH_SMDK6410
 	select REGULATOR
 	select REGULATOR_WM8350
+	select S3C24XX_GPIO_EXTRA64
 	select MFD_WM8350_I2C
 	select MFD_WM8350_CONFIG_MODE_0
 	select MFD_WM8350_CONFIG_MODE_3
diff --git a/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c b/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c
index ea51dbe76e3e..9f1a21462620 100644
--- a/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -320,6 +320,9 @@ static int __init smdk6410_wm8350_init(struct wm8350 *wm8350)
 {
 	int i;
 
+	/* Configure the IRQ line */
+	s3c_gpio_setpull(S3C64XX_GPN(12), S3C_GPIO_PULL_UP);
+
 	/* Instantiate the regulators */
 	for (i = 0; i < ARRAY_SIZE(wm1190_regulators); i++)
 		wm8350_register_regulator(wm8350,