diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:37:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:37:51 +0200 |
| commit | 602b9ba2cb0c62595fa94650f9826ee37f6c633c (patch) | |
| tree | aa7dce9b8b603177daf93cd58e28a6e34acfe26f /arch/arm/mach-mmp/irq.c | |
| parent | 853b20396becfe9425f4d5da74e10ea67811b188 (diff) | |
| parent | 902ca2297180fe97f840427c114cc6dc7e77375e (diff) | |
Merge branch 'power' of git://github.com/hzhuang1/linux into next/pm
* 'power' of git://github.com/hzhuang1/linux:
ARM: mmp: add pm support for pxa910
ARM: mmp: ttc_dkb: add PMIC support
ARM: cache: tauros2: add disable and resume callback
ARM: mm: proc-mohawk: add suspend resume for mohawk
ARM: mmp: add PM support for mmp2
ARM: mmp: move XX_REG definition to addr-map.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/irq.c')
| -rw-r--r-- | arch/arm/mach-mmp/irq.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/irq.c b/arch/arm/mach-mmp/irq.c index 3705470c9f1..fcfe0e3bd70 100644 --- a/arch/arm/mach-mmp/irq.c +++ b/arch/arm/mach-mmp/irq.c @@ -23,6 +23,13 @@ #include <mach/irqs.h> +#ifdef CONFIG_CPU_MMP2 +#include <mach/pm-mmp2.h> +#endif +#ifdef CONFIG_CPU_PXA910 +#include <mach/pm-pxa910.h> +#endif + #include "common.h" #define MAX_ICU_NR 16 @@ -209,6 +216,9 @@ void __init icu_init_irq(void) set_irq_flags(irq, IRQF_VALID); } irq_set_default_host(icu_data[0].domain); +#ifdef CONFIG_CPU_PXA910 + icu_irq_chip.irq_set_wake = pxa910_set_wake; +#endif } /* MMP2 (ARMv7) */ @@ -305,6 +315,9 @@ void __init mmp2_init_icu(void) set_irq_flags(irq, IRQF_VALID); } irq_set_default_host(icu_data[0].domain); +#ifdef CONFIG_CPU_MMP2 + icu_irq_chip.irq_set_wake = mmp2_set_wake; +#endif } #ifdef CONFIG_OF |