From 0170159ae34957efb839d9143123f7ced795f62e Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 2 Dec 2010 14:36:17 +0530 Subject: [PATCH] omap: irq: Dummy handler for enable_irq_wake With PM enabled, enable_irq_wake() has a callback for interrupt controllers. But since omap INTC handler did not had this call back associated, it was always returning -ENXIO, which was breaking the existing drivers. This patch adds dummy handlers in in order to avoid breaking of existing drivers. Without this patch you get below warnings with wakeup enabled on devices ------------[ cut here ]------------ WARNING: at kernel/irq/manage.c:382 set_irq_wake+0x80/0xe4() Unbalanced IRQ 72 wake disable Modules linked in: [] (unwind_backtrace+0x0/0xec) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_fmt+0x2c/0x3c [] (warn_slowpath_fmt+0x2c/0x3c) from [] (set_irq_wake+0x80/0xe4) [] (set_irq_wake+0x80/0xe4) from [] (uart_resume_port+0x84/0x248) [] (uart_resume_port+0x84/0x248) from [] (serial_omap_resume+0x20/0x2c) [] (serial_omap_resume+0x20/0x2c) from [] (platform_pm_resume+0x48/0x54) [] (platform_pm_resume+0x48/0x54) from [] (pm_op+0x6c/0xac) [] (pm_op+0x6c/0xac) from [] (device_resume+0x58/0x10c) [] (device_resume+0x58/0x10c) from [] (dpm_resume_end+0xf4/0x360) [] (dpm_resume_end+0xf4/0x360) from [] (suspend_devices_and_enter+0x1ac/ 0x200) [] (suspend_devices_and_enter+0x1ac/0x200) from [] (enter_state+0xe0/0x1 38) [] (enter_state+0xe0/0x138) from [] (state_store+0x90/0xb8) [] (state_store+0x90/0xb8) from [] (kobj_attr_store+0x18/0x1c) [] (kobj_attr_store+0x18/0x1c) from [] (sysfs_write_file+0x10c/0x144) [] (sysfs_write_file+0x10c/0x144) from [] (vfs_write+0xac/0x134) [] (vfs_write+0xac/0x134) from [] (sys_write+0x3c/0x68) [] (sys_write+0x3c/0x68) from [] (ret_fast_syscall+0x0/0x3c) ---[ end trace 19fe50b7b47ba94f ]--- Reported-by: Paul Walmsley Tested-by: Govindraj.R Signed-off-by: Santosh Shilimkar --- arch/arm/mach-omap2/irq.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 32eeabe..6a964d3 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -143,11 +143,21 @@ static void omap_mask_ack_irq(unsigned int irq) omap_ack_irq(irq); } +#ifdef CONFIG_PM +static int omap_set_wake(unsigned int irq, unsigned int on) +{ + return 0; +} +#else +#define omap_set_wake NULL +#endif + static struct irq_chip omap_irq_chip = { .name = "INTC", .ack = omap_mask_ack_irq, .mask = omap_mask_irq, .unmask = omap_unmask_irq, + .set_wake = omap_set_wake, }; static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) -- 1.6.0.4