From: Jason Cooper <jason@lakedaemon.net>
Date: Fri, 10 Apr 2015 22:58:19 +0000 (+0000)
Subject: Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a01e7b3258bea93fbf1f028fab1c739d80c61823;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core

Conflicts:
	drivers/irqchip/irq-gic.c
---

a01e7b3258bea93fbf1f028fab1c739d80c61823
diff --cc drivers/irqchip/irq-gic.c
index 868983c6aa5e,072432c22207..61ffbbc92f37
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -880,6 -891,42 +880,11 @@@ static const struct irq_domain_ops gic_
  	.xlate = gic_irq_domain_xlate,
  };
  
 -/* Default functions for routable irq domain */
 -static int gic_routable_irq_domain_map(struct irq_domain *d, unsigned int irq,
 -			      irq_hw_number_t hw)
 -{
 -	return 0;
 -}
 -
 -static void gic_routable_irq_domain_unmap(struct irq_domain *d,
 -					  unsigned int irq)
 -{
 -}
 -
 -static int gic_routable_irq_domain_xlate(struct irq_domain *d,
 -				struct device_node *controller,
 -				const u32 *intspec, unsigned int intsize,
 -				unsigned long *out_hwirq,
 -				unsigned int *out_type)
 -{
 -	*out_hwirq += 16;
 -	return 0;
 -}
 -
 -static const struct irq_domain_ops gic_default_routable_irq_domain_ops = {
 -	.map = gic_routable_irq_domain_map,
 -	.unmap = gic_routable_irq_domain_unmap,
 -	.xlate = gic_routable_irq_domain_xlate,
 -};
 -
 -const struct irq_domain_ops *gic_routable_irq_domain_ops =
 -					&gic_default_routable_irq_domain_ops;
 -
+ void gic_set_irqchip_flags(unsigned long flags)
+ {
+ 	gic_chip.flags |= flags;
+ }
+ 
  void __init gic_init_bases(unsigned int gic_nr, int irq_start,
  			   void __iomem *dist_base, void __iomem *cpu_base,
  			   u32 percpu_offset, struct device_node *node)