---

yaml --- r: 180258 b: refs/heads/master c: 3d661ac h: refs/heads/master v: v3
git-mirror · Jan 5, 2010 · bb7c03d · bb7c03d
1 parent 4bd46ce
commit bb7c03d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd02acdbb28be99ed87ec11c3ef61a5eec4e2dd7
+refs/heads/master: 3d661ac187e72af71d3bb7d48a46012180a6fc46
diff --git a/trunk/arch/arm/mach-mx3/mx31ads.c b/trunk/arch/arm/mach-mx3/mx31ads.c
@@ -462,6 +462,7 @@ static int mx31_wm8350_init(struct wm8350 *wm8350)
 
 static struct wm8350_platform_data __initdata mx31_wm8350_pdata = {
 	.init = mx31_wm8350_init,
+	.irq_base = MXC_BOARD_IRQ_START + MXC_MAX_EXP_IO_LINES,
 };
 #endif
 

diff --git a/trunk/arch/arm/plat-mxc/include/mach/irqs.h b/trunk/arch/arm/plat-mxc/include/mach/irqs.h
@@ -37,7 +37,12 @@
  * within sensible limits.
  */
 #define MXC_BOARD_IRQ_START	(MXC_INTERNAL_IRQS + MXC_GPIO_IRQS)
+
+#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
+#define MXC_BOARD_IRQS  80
+#else
 #define MXC_BOARD_IRQS	16
+#endif
 
 #define MXC_IPU_IRQ_START	(MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
-Original file line number
+Diff line change
@@ Expand Up / @@ -462,6 +462,7 @@ static int mx31_wm8350_init(struct wm8350 *wm8350) @@
     static struct wm8350_platform_data __initdata mx31_wm8350_pdata = {
     	.init = mx31_wm8350_init,
+    	.irq_base = MXC_BOARD_IRQ_START + MXC_MAX_EXP_IO_LINES,
     };
     #endif
@@ Expand Down @@