Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752742AbbHSXXJ (ORCPT ); Wed, 19 Aug 2015 19:23:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57904 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752636AbbHSXXF (ORCPT ); Wed, 19 Aug 2015 19:23:05 -0400 Date: Wed, 19 Aug 2015 16:22:18 -0700 From: tip-bot for Grygorii Strashko Message-ID: Cc: linux-arm-kernel@lists.infradead.org, balbi@ti.com, tony@atomide.com, hpa@zytor.com, nsekhar@ti.com, grygorii.strashko@ti.com, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, mingo@kernel.org, marc.zyngier@arm.com, jason@lakedaemon.net, tglx@linutronix.de, linux@arm.linux.org.uk Reply-To: tony@atomide.com, nsekhar@ti.com, hpa@zytor.com, linux-arm-kernel@lists.infradead.org, balbi@ti.com, sudeep.holla@arm.com, grygorii.strashko@ti.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, mingo@kernel.org, tglx@linutronix.de, linux@arm.linux.org.uk, jason@lakedaemon.net In-Reply-To: <1439554830-19502-4-git-send-email-grygorii.strashko@ti.com> References: <1439554830-19502-4-git-send-email-grygorii.strashko@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/crossbar: Restore the irq_set_type() mechanism Git-Commit-ID: e269ec42328783e51be08c191aa935dba56141fc 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: 2276 Lines: 57 Commit-ID: e269ec42328783e51be08c191aa935dba56141fc Gitweb: http://git.kernel.org/tip/e269ec42328783e51be08c191aa935dba56141fc Author: Grygorii Strashko AuthorDate: Fri, 14 Aug 2015 15:20:27 +0300 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 00:25:25 +0200 irqchip/crossbar: Restore the irq_set_type() mechanism The conversion of the crossbar irqchip to hierarchical irq domains failed to provide a mechanism to properly set the trigger type of an interrupt. The crossbar 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 crossbar 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: 783d31863fb8 ('irqchip: crossbar: Convert dra7 crossbar...') Signed-off-by: Grygorii Strashko Cc: Sudeep Holla Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: stable@vger.kernel.org # 4.1 Link: http://lkml.kernel.org/r/1439554830-19502-4-git-send-email-grygorii.strashko@ti.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-crossbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 692fe2b..3ba58e7 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -69,6 +69,7 @@ static struct irq_chip crossbar_chip = { .irq_unmask = irq_chip_unmask_parent, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_set_wake = irq_chip_set_wake_parent, + .irq_set_type = irq_chip_set_type_parent, #ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent, #endif -- 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/