Skip to content

Commit 429f9ce

Browse files
geertuDinh Nguyen
authored andcommitted
irqchip/renesas-intc-irqpin: Propagate wake-up settings to parent
The renesas-intc-irqpin interrupt controller is cascaded to the GIC, but its driver doesn't propagate wake-up settings to the parent interrupt controller. Since commit aec89ef ("irqchip/gic: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND"), the GIC driver masks interrupts during suspend, and wake-up through gpio-keys now fails on r8a7740/armadillo and sh73a0/kzm9g. Fix this by propagating wake-up settings to the parent interrupt controller. There's no need to handle irq_set_irq_wake() failures, as the renesas-intc-irqpin interrupt controller is always cascaded to a GIC, and the GIC driver always sets SKIP_SET_WAKE since the aforementioned commit. Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Sudeep Holla <[email protected]> Cc: Magnus Damm <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Marc Zyngier <[email protected]> Link: http://lkml.kernel.org/r/1441731636-17610-2-git-send-email-geert%[email protected] Signed-off-by: Thomas Gleixner <[email protected]> (cherry picked from commit f4e209c) Signed-off-by: Simon Horman <[email protected]>
1 parent 60c853d commit 429f9ce

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/irqchip/irq-renesas-intc-irqpin.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ static int intc_irqpin_irq_set_type(struct irq_data *d, unsigned int type)
283283
static int intc_irqpin_irq_set_wake(struct irq_data *d, unsigned int on)
284284
{
285285
struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d);
286+
int hw_irq = irqd_to_hwirq(d);
287+
288+
irq_set_irq_wake(p->irq[hw_irq].requested_irq, on);
286289

287290
if (!p->clk)
288291
return 0;

0 commit comments

Comments
 (0)