diff options
author | Grygorii Strashko <grygorii.strashko@ti.com> | 2015-08-14 08:20:30 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-19 18:25:26 -0400 |
commit | 8200fe4347870d4ad6475048bcdf3e7c106c5268 (patch) | |
tree | 9ef8b2c63e00f9a5fa6af0beb79948025a392643 | |
parent | 4fd8f47e7e5b64a74b60f23c2e08ba8234d659d1 (diff) |
irqchip/crossbar: Restore set_wake functionality
The TI crossbar irqchip doesn't provides any facility to configure the
wakeup sources, but the conversion to hierarchical irqdomains set the
irq_set_wake callback to irq_chip_set_wake_parent. The parent chip
(OMAP wakeupgen) has no irq_set_wake function either so the call will
fail with -ENOSYS. As a result the irq_set_wake() call in the resume
path will trigger an 'Unbalanced wake disable' warning.
Before the conversion the GIC irqchip was the top level irqchip and
correctly flagged with IRQCHIP_SKIP_SET_WAKE.
Restore the correct behaviour by removing the irq_set_type callback
from the crossbar irqchip and set the IRQCHIP_SKIP_SET_WAKE flag which
lets the irq_set_irq_wake() call from the driver succeed.
[ tglx: Massaged changelog ]
Fixes: 783d31863fb8 ('irqchip: crossbar: Convert dra7 crossbar...')
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: <linux@arm.linux.org.uk>
Cc: <nsekhar@ti.com>
Cc: <jason@lakedaemon.net>
Cc: <balbi@ti.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: <tony@atomide.com>
Cc: <marc.zyngier@arm.com>
Cc: stable@vger.kernel.org # 4.1
Link: http://lkml.kernel.org/r/1439554830-19502-7-git-send-email-grygorii.strashko@ti.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | drivers/irqchip/irq-crossbar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index f5a72ccb4376..c12bb93334ff 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c | |||
@@ -68,9 +68,9 @@ static struct irq_chip crossbar_chip = { | |||
68 | .irq_mask = irq_chip_mask_parent, | 68 | .irq_mask = irq_chip_mask_parent, |
69 | .irq_unmask = irq_chip_unmask_parent, | 69 | .irq_unmask = irq_chip_unmask_parent, |
70 | .irq_retrigger = irq_chip_retrigger_hierarchy, | 70 | .irq_retrigger = irq_chip_retrigger_hierarchy, |
71 | .irq_set_wake = irq_chip_set_wake_parent, | ||
72 | .irq_set_type = irq_chip_set_type_parent, | 71 | .irq_set_type = irq_chip_set_type_parent, |
73 | .flags = IRQCHIP_MASK_ON_SUSPEND, | 72 | .flags = IRQCHIP_MASK_ON_SUSPEND | |
73 | IRQCHIP_SKIP_SET_WAKE, | ||
74 | #ifdef CONFIG_SMP | 74 | #ifdef CONFIG_SMP |
75 | .irq_set_affinity = irq_chip_set_affinity_parent, | 75 | .irq_set_affinity = irq_chip_set_affinity_parent, |
76 | #endif | 76 | #endif |