Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull irq updates from Thomas Gleixner:
 "This lot provides:

   * Bugfixes for armada irq controller
   * Updates to renesas irq chip
   * Support for the TI-NSPIRE irq controller

  Not strictly a bug fix only pull request, but important updates for
  some of the arm Socs which I completely forgot to send last week.

  Seems like my obliviousness is getting worse, I just can't remember
  when it started"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Add support for TI-NSPIRE irqchip
  irqchip: renesas-irqc: Enable mask on suspend
  irqchip: renesas-irqc: Use lazy disable
  irqchip: armada-370-xp: fix MSI race condition
  irqchip: armada-370-xp: fix IPI race condition

diff --combined drivers/irqchip/Makefile
index 86b484cb3ec2d1f99b4c708c2a35abb60a315a91,292b10645fd8fc848ae98759fc98b5472b8c662b..5194afb39e781062bc6e82d55163174494fbb751
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -6,7 -6,6 +6,7 @@@ obj-$(CONFIG_ARCH_MMP)                   += irq-mmp.
  obj-$(CONFIG_ARCH_MVEBU)              += irq-armada-370-xp.o
  obj-$(CONFIG_ARCH_MXS)                        += irq-mxs.o
  obj-$(CONFIG_ARCH_S3C24XX)            += irq-s3c24xx.o
 +obj-$(CONFIG_DW_APB_ICTL)             += irq-dw-apb-ictl.o
  obj-$(CONFIG_METAG)                   += irq-metag-ext.o
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)  += irq-metag.o
  obj-$(CONFIG_ARCH_MOXART)             += irq-moxart.o
@@@ -21,7 -20,6 +21,8 @@@ obj-$(CONFIG_SIRF_IRQ)                        += irq-sirfsoc
  obj-$(CONFIG_RENESAS_INTC_IRQPIN)     += irq-renesas-intc-irqpin.o
  obj-$(CONFIG_RENESAS_IRQC)            += irq-renesas-irqc.o
  obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq-versatile-fpga.o
+ obj-$(CONFIG_ARCH_NSPIRE)             += irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
  obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
 +obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o
 +obj-$(CONFIG_XTENSA_MX)                       += irq-xtensa-mx.o

diff --combined drivers/irqchip/irq-armada-370-xp.c
index 9300bc32784eb689d3021130a7330cbd4d106308,3fac063b4a78773229582fc99090e2984b7c371a..540956465ed2db759ca72eae11a26b16a4c17047
--- 1/drivers/irqchip/irq-armada-370-xp.c
--- 2/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@@ -59,6 -59,8 +59,6 @@@
  #define PCI_MSI_DOORBELL_END                    (32)
  #define PCI_MSI_DOORBELL_MASK                   0xFFFF0000
  
 -static DEFINE_RAW_SPINLOCK(irq_controller_lock);
 -
  static void __iomem *per_cpu_int_base;
  static void __iomem *main_int_base;
  static struct irq_domain *armada_370_xp_mpic_domain;
@@@ -237,8 -239,6 +237,8 @@@ static inline int armada_370_xp_msi_ini
  #endif
  
  #ifdef CONFIG_SMP
 +static DEFINE_RAW_SPINLOCK(irq_controller_lock);
 +
  static int armada_xp_set_affinity(struct irq_data *d,
                                  const struct cpumask *mask_val, bool force)
  {
@@@ -381,7 -381,7 +381,7 @@@ armada_370_xp_handle_irq(struct pt_reg
                                                ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS)
                                & PCI_MSI_DOORBELL_MASK;
  
-                       writel(~PCI_MSI_DOORBELL_MASK, per_cpu_int_base +
+                       writel(~msimask, per_cpu_int_base +
                               ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);
  
                        for (msinr = PCI_MSI_DOORBELL_START;
@@@ -407,7 -407,7 +407,7 @@@
                                                ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS)
                                & IPI_DOORBELL_MASK;
  
-                       writel(~IPI_DOORBELL_MASK, per_cpu_int_base +
+                       writel(~ipimask, per_cpu_int_base +
                                ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);
  
                        /* Handle all pending doorbells */