summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2015-04-10 18:58:19 -0400
committerJason Cooper <jason@lakedaemon.net>2015-04-10 18:58:19 -0400
commita01e7b3258bea93fbf1f028fab1c739d80c61823 (patch)
treef78d0d13faa406524a58d9ce64756ffdabb64400 /drivers/irqchip
parentfb414e908b15ae3d704aa0572f77981a516279b9 (diff)
parent008e4d6735091bfe5be12918cb66c55e178361bf (diff)
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
Conflicts: drivers/irqchip/irq-gic.c
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-gic.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 868983c6aa5e..61ffbbc92f37 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -880,6 +880,11 @@ static const struct irq_domain_ops gic_irq_domain_ops = {
880 .xlate = gic_irq_domain_xlate, 880 .xlate = gic_irq_domain_xlate,
881}; 881};
882 882
883void gic_set_irqchip_flags(unsigned long flags)
884{
885 gic_chip.flags |= flags;
886}
887
883void __init gic_init_bases(unsigned int gic_nr, int irq_start, 888void __init gic_init_bases(unsigned int gic_nr, int irq_start,
884 void __iomem *dist_base, void __iomem *cpu_base, 889 void __iomem *dist_base, void __iomem *cpu_base,
885 u32 percpu_offset, struct device_node *node) 890 u32 percpu_offset, struct device_node *node)