diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-05 16:05:16 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-05 17:08:54 +0100 |
| commit | 3d661ac187e72af71d3bb7d48a46012180a6fc46 (patch) | |
| tree | 361933411dd6879f1b490dfd4c00a7b50e128733 /arch/arm | |
| parent | bd02acdbb28be99ed87ec11c3ef61a5eec4e2dd7 (diff) | |
| download | kernel_samsung_smdk4412-3d661ac187e72af71d3bb7d48a46012180a6fc46.zip kernel_samsung_smdk4412-3d661ac187e72af71d3bb7d48a46012180a6fc46.tar.gz kernel_samsung_smdk4412-3d661ac187e72af71d3bb7d48a46012180a6fc46.tar.bz2 | |
mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
The WM8350 core won't actually use the range yet, but it will in
future and the platform data to configure it is there now.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mx3/mx31ads.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/irqs.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c index e205456..938c549 100644 --- a/arch/arm/mach-mx3/mx31ads.c +++ b/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/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h index ead9d59..0cb3476 100644 --- a/arch/arm/plat-mxc/include/mach/irqs.h +++ b/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) |