diff options
| author | Olof Johansson | 2013-08-29 22:21:24 +0200 |
|---|---|---|
| committer | Olof Johansson | 2013-08-29 22:21:24 +0200 |
| commit | 66fafb6fbf03c8b0bb5978041ace3bce40821c4e (patch) | |
| tree | 5e286317a5a42dbbd942187b74a9f9823ab53c76 /arch/arm/mach-mmp/pxa910.c | |
| parent | Merge tag 'ux500-core-for-arm-soc-2' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | irqchip: mmp: avoid to include irqs head file (diff) | |
| download | kernel-qcow2-linux-66fafb6fbf03c8b0bb5978041ace3bce40821c4e.tar.gz kernel-qcow2-linux-66fafb6fbf03c8b0bb5978041ace3bce40821c4e.tar.xz kernel-qcow2-linux-66fafb6fbf03c8b0bb5978041ace3bce40821c4e.zip | |
Merge tag 'mmp-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into late/all
From Haojian Zhuang:
Move irq driver out of mach-mmp to support multiplatform
* tag 'mmp-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
irqchip: mmp: avoid to include irqs head file
ARM: mmp: avoid to include head file in mach-mmp
irqchip: mmp: support irqchip
irqchip: move mmp irq driver
Diffstat (limited to 'arch/arm/mach-mmp/pxa910.c')
| -rw-r--r-- | arch/arm/mach-mmp/pxa910.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index ce6393acad86..eb57ee196842 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -12,6 +12,8 @@ #include <linux/init.h> #include <linux/list.h> #include <linux/io.h> +#include <linux/irq.h> +#include <linux/irqchip/mmp.h> #include <linux/platform_device.h> #include <asm/hardware/cache-tauros2.h> @@ -23,6 +25,8 @@ #include <mach/dma.h> #include <mach/mfp.h> #include <mach/devices.h> +#include <mach/pm-pxa910.h> +#include <mach/pxa910.h> #include "common.h" @@ -79,6 +83,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata = void __init pxa910_init_irq(void) { icu_init_irq(); +#ifdef CONFIG_PM + icu_irq_chip.irq_set_wake = pxa910_set_wake; +#endif } static int __init pxa910_init(void) |