From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754281AbbIOPuh (ORCPT ); Tue, 15 Sep 2015 11:50:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57222 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbbIOPuf (ORCPT ); Tue, 15 Sep 2015 11:50:35 -0400 Date: Tue, 15 Sep 2015 08:50:17 -0700 From: tip-bot for Geert Uytterhoeven Message-ID: Cc: sudeep.holla@arm.com, magnus.damm@gmail.com, hpa@zytor.com, marc.zyngier@arm.com, jason@lakedaemon.net, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, geert+renesas@glider.be Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, geert+renesas@glider.be, marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, sudeep.holla@arm.com, hpa@zytor.com, magnus.damm@gmail.com In-Reply-To: <1441731636-17610-2-git-send-email-geert+renesas@glider.be> References: <1441731636-17610-2-git-send-email-geert+renesas@glider.be> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/renesas-intc-irqpin: Propagate wake-up settings to parent Git-Commit-ID: f4e209cdc7a00f934007f40cf885471799073b0d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f4e209cdc7a00f934007f40cf885471799073b0d Gitweb: http://git.kernel.org/tip/f4e209cdc7a00f934007f40cf885471799073b0d Author: Geert Uytterhoeven AuthorDate: Tue, 8 Sep 2015 19:00:35 +0200 Committer: Thomas Gleixner CommitDate: Tue, 15 Sep 2015 17:06:29 +0200 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 aec89ef72ba6c944 ("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 Cc: Sudeep Holla Cc: Magnus Damm Cc: Jason Cooper Cc: Marc Zyngier Link: http://lkml.kernel.org/r/1441731636-17610-2-git-send-email-geert%2Brenesas@glider.be Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-renesas-intc-irqpin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c index 67797ee..d3546a6 100644 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c @@ -283,6 +283,9 @@ static int intc_irqpin_irq_set_type(struct irq_data *d, unsigned int type) static int intc_irqpin_irq_set_wake(struct irq_data *d, unsigned int on) { struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); + int hw_irq = irqd_to_hwirq(d); + + irq_set_irq_wake(p->irq[hw_irq].requested_irq, on); if (!p->clk) return 0;