Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752774AbbHSXXU (ORCPT ); Wed, 19 Aug 2015 19:23:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57910 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326AbbHSXXQ (ORCPT ); Wed, 19 Aug 2015 19:23:16 -0400 Date: Wed, 19 Aug 2015 16:22:38 -0700 From: tip-bot for Grygorii Strashko Message-ID: Cc: balbi@ti.com, grygorii.strashko@ti.com, linux-kernel@vger.kernel.org, tony@atomide.com, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, jason@lakedaemon.net, sudeep.holla@arm.com, tglx@linutronix.de, linux@arm.linux.org.uk, mingo@kernel.org, nsekhar@ti.com Reply-To: mingo@kernel.org, nsekhar@ti.com, tglx@linutronix.de, sudeep.holla@arm.com, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, grygorii.strashko@ti.com, tony@atomide.com, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, jason@lakedaemon.net, balbi@ti.com In-Reply-To: <1439554830-19502-5-git-send-email-grygorii.strashko@ti.com> References: <1439554830-19502-5-git-send-email-grygorii.strashko@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism Git-Commit-ID: 63059a272398ef5dc1bd7065a036e8b6e82d1af7 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 Content-Length: 2374 Lines: 57 Commit-ID: 63059a272398ef5dc1bd7065a036e8b6e82d1af7 Gitweb: http://git.kernel.org/tip/63059a272398ef5dc1bd7065a036e8b6e82d1af7 Author: Grygorii Strashko AuthorDate: Fri, 14 Aug 2015 15:20:28 +0300 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 00:25:25 +0200 ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism The conversion of the wakeupgen irqchip to hierarchical irq domains failed to provide a mechanism to properly set the trigger type of an interrupt. The wakeupgen irq chip itself has no mechanism and therefor no irq_set_type() callback. The code before the conversion relayed the trigger configuration directly to the underlying GIC. Restore the correct behaviour by setting the wakeupgen irq_set_type callback to irq_chip_set_type_parent(). This propagates the set_trigger() call to the underlying GIC irqchip. [ tglx: Massaged changelog ] Fixes: 7136d457f365 ('ARM: omap: convert wakeupgen to stacked domains') Signed-off-by: Grygorii Strashko Acked-by: Tony Lindgren Cc: Sudeep Holla Cc: Cc: Cc: Cc: Cc: Cc: Cc: stable@vger.kernel.org # 4.1 Link: http://lkml.kernel.org/r/1439554830-19502-5-git-send-email-grygorii.strashko@ti.com Signed-off-by: Thomas Gleixner --- arch/arm/mach-omap2/omap-wakeupgen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 8e52621..e1d2e99 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -392,6 +392,7 @@ static struct irq_chip wakeupgen_chip = { .irq_mask = wakeupgen_mask, .irq_unmask = wakeupgen_unmask, .irq_retrigger = irq_chip_retrigger_hierarchy, + .irq_set_type = irq_chip_set_type_parent, .flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND, #ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/