diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-06-16 09:46:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-06-16 09:46:08 -0700 |
| commit | f49cc57cc9d1686bdca068c40bc43f1690aa02d3 (patch) | |
| tree | e2efe59e17d2bf787400f46f0249c511126d6025 /arch/arm/mach-shmobile/intc-sh73a0.c | |
| parent | Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: mach-shmobile: mackerel: tidyup usbhs driver settings (diff) | |
| download | linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.tar.gz linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.tar.bz2 linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.zip | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
ARM: mach-shmobile: mackerel: tidyup usbhs driver settings
ARM: mach-shmobile: Correct SCIF port types for SH7367.
ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix
ARM: mach-shmobile: Mackerel USB platform data update
ARM: mach-shmobile: AG5EVM SDHI1 platform data update
Diffstat (limited to 'arch/arm/mach-shmobile/intc-sh73a0.c')
| -rw-r--r-- | arch/arm/mach-shmobile/intc-sh73a0.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index 5d0e1503ece6..a911a60e7719 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c @@ -250,6 +250,11 @@ static irqreturn_t sh73a0_intcs_demux(int irq, void *dev_id) return IRQ_HANDLED; } +static int sh73a0_set_wake(struct irq_data *data, unsigned int on) +{ + return 0; /* always allow wakeup */ +} + void __init sh73a0_init_irq(void) { void __iomem *gic_dist_base = __io(0xf0001000); @@ -257,6 +262,7 @@ void __init sh73a0_init_irq(void) void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE); gic_init(0, 29, gic_dist_base, gic_cpu_base); + gic_arch_extn.irq_set_wake = sh73a0_set_wake; register_intc_controller(&intcs_desc); |