From 5d91c812f152f6d9a4e7e732de37e9ff86893ec0 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 27 Jan 2010 18:13:59 +0900
Subject: [PATCH] --- yaml --- r: 187636 b: refs/heads/master c:
 2848552cef6a14fe4e54e676a61a340c8fd023b3 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/plat-s5p/include/plat/irqs.h | 2 +-
 trunk/arch/arm/plat-samsung/dev-usb-hsotg.c | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f90b3fe49e94..2b4cfb688a84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec
+refs/heads/master: 2848552cef6a14fe4e54e676a61a340c8fd023b3
diff --git a/trunk/arch/arm/plat-s5p/include/plat/irqs.h b/trunk/arch/arm/plat-s5p/include/plat/irqs.h
index 101038d49944..878acfe3690f 100644
--- a/trunk/arch/arm/plat-s5p/include/plat/irqs.h
+++ b/trunk/arch/arm/plat-s5p/include/plat/irqs.h
@@ -74,7 +74,7 @@
 #define S5P_IRQ_VIC0(x)		(S5P_VIC0_BASE + (x))
 #define S5P_IRQ_VIC1(x)		(S5P_VIC1_BASE + (x))
 
-#define S5P_TIMER_IRQ(x)	S5P_IRQ(11 + (x))
+#define S5P_TIMER_IRQ(x)	S5P_IRQ(64 + (x))
 
 #define IRQ_TIMER0		S5P_TIMER_IRQ(0)
 #define IRQ_TIMER1		S5P_TIMER_IRQ(1)
diff --git a/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c b/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
index e2f604b51c86..33a844ab6917 100644
--- a/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
+++ b/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 
 #include <mach/irqs.h>
 #include <mach/map.h>
@@ -33,9 +34,15 @@ static struct resource s3c_usb_hsotg_resources[] = {
 	},
 };
 
+static u64 s3c_hsotg_dmamask = DMA_BIT_MASK(32);
+
 struct platform_device s3c_device_usb_hsotg = {
 	.name		= "s3c-hsotg",
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(s3c_usb_hsotg_resources),
 	.resource	= s3c_usb_hsotg_resources,
+	.dev		= {
+		.dma_mask		= &s3c_hsotg_dmamask,
+		.coherent_dma_mask	= DMA_BIT_MASK(32),
+	},
 };