@@ -810,13 +810,13 @@ int __init omap_mux_late_init(void)
return 0;
ret = request_irq(omap_prcm_event_to_irq("io"),
- omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,
+ omap_hwmod_mux_handle_irq, IRQF_SHARED,
"hwmod_io", omap_mux_late_init);
if (ret)
pr_warn("mux: Failed to setup hwmod io irq %d\n", ret);
- return 0;
+ return enable_irq_wake(omap_prcm_event_to_irq("io"));
}
static void __init omap_mux_package_fixup(struct omap_mux *p,
@@ -472,23 +472,22 @@ int __init omap3_pm_init(void)
prcm_setup_regs();
ret = request_irq(omap_prcm_event_to_irq("wkup"),
- _prcm_int_handle_wakeup, IRQF_NO_SUSPEND, "pm_wkup", NULL);
+ _prcm_int_handle_wakeup, 0, "pm_wkup", NULL);
if (ret) {
pr_err("pm: Failed to request pm_wkup irq\n");
goto err1;
}
+ enable_irq_wake(omap_prcm_event_to_irq("wkup"));
/* IO interrupt is shared with mux code */
ret = request_irq(omap_prcm_event_to_irq("io"),
- _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io",
- omap3_pm_init);
- enable_irq(omap_prcm_event_to_irq("io"));
-
+ _prcm_int_handle_io, IRQF_SHARED, "pm_io", omap3_pm_init);
if (ret) {
pr_err("pm: Failed to request pm_io irq\n");
goto err2;
}
+ enable_irq_wake(omap_prcm_event_to_irq("io"));
ret = pwrdm_for_each(pwrdms_setup, NULL);
if (ret) {
@@ -338,6 +338,7 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)
ct->chip.irq_ack = irq_gc_ack_set_bit;
ct->chip.irq_mask = irq_gc_mask_clr_bit;
ct->chip.irq_unmask = irq_gc_mask_set_bit;
+ ct->chip.flags = IRQCHIP_SKIP_SET_WAKE;
ct->regs.ack = irq_setup->ack + i * 4;
ct->regs.mask = irq_setup->mask + i * 4;
The IRQF_NO_SUSPEND flag is used to identify the interrupts that should be left enabled so as to allow them to work as expected during the suspend-resume cycle, but doesn't guarantee that it will wake the system from a suspended state, enable_irq_wake is recommended to be used for the wakeup. This patch removes the use of IRQF_NO_SUSPEND flags replacing it with enable_irq_wake instead. Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/arm/mach-omap2/mux.c | 4 ++-- arch/arm/mach-omap2/pm34xx.c | 9 ++++----- arch/arm/mach-omap2/prm_common.c | 1 + 3 files changed, 7 insertions(+), 7 deletions(-)