Merge tag 'irqchip-core-4.6-2' of git://git.infradead.org/users/jcooper/linux into...

Pull the second round of irqchip core changes for v4.6 from Jason Cooper:

- mvebu:
   - Add odmi driver for Marvell 7K/8K SoCs
   - Replace driver-specific set_affinity with generic version

- mips:
   - Move ath79 MISC and CPU drivers from arch/ code to irqchip/

- tango:
   - Add support for Sigma Designs SMP8[67]xx ctrl

diff --combined drivers/irqchip/Kconfig
index 0bd819c6c911a20cfc65915de85ab806cc0fea14,70a614b4fe05decb1d2f8c42e7da84ac867a8a79..0ffbdfdc41705d83411ceae8ed4f10f508f004de
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -83,11 -83,6 +83,11 @@@ config I825
        bool
        select IRQ_DOMAIN
  
 +config BCM6345_L1_IRQ
 +      bool
 +      select GENERIC_IRQ_CHIP
 +      select IRQ_DOMAIN
 +
  config BCM7038_L1_IRQ
        bool
        select GENERIC_IRQ_CHIP
@@@ -161,6 -156,11 +161,11 @@@ config ST_IRQCHI
        help
          Enables SysCfg Controlled IRQs on STi based platforms.
  
+ config TANGO_IRQ
+       bool
+       select IRQ_DOMAIN
+       select GENERIC_IRQ_CHIP
+ 
  config TB10X_IRQC
        bool
        select IRQ_DOMAIN
@@@ -229,3 -229,7 +234,7 @@@ config IRQ_MX
        def_bool y if MACH_ASM9260 || ARCH_MXS
        select IRQ_DOMAIN
        select STMP_DEVICE
+ 
+ config MVEBU_ODMI
+       bool
+       select GENERIC_MSI_IRQ_DOMAIN

diff --combined drivers/irqchip/Makefile
index ba0295d16a4686e4043f1836d13721a442bd9642,c01598d0418b1287f9e032f91e47286f7d7ceacb..8698710fda37f4609d9e916356ca4242c6058685
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -1,5 -1,7 +1,7 @@@
  obj-$(CONFIG_IRQCHIP)                 += irqchip.o
  
+ obj-$(CONFIG_ATH79)                   += irq-ath79-cpu.o
+ obj-$(CONFIG_ATH79)                   += irq-ath79-misc.o
  obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2835.o
  obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2836.o
  obj-$(CONFIG_ARCH_EXYNOS)             += exynos-combiner.o
@@@ -40,13 -42,13 +42,14 @@@ obj-$(CONFIG_VERSATILE_FPGA_IRQ)   += irq
  obj-$(CONFIG_ARCH_NSPIRE)             += irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
  obj-$(CONFIG_ST_IRQCHIP)              += irq-st.o
+ obj-$(CONFIG_TANGO_IRQ)                       += irq-tango.o
  obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
  obj-$(CONFIG_TS4800_IRQ)              += irq-ts4800.o
  obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o
  obj-$(CONFIG_XTENSA_MX)                       += irq-xtensa-mx.o
  obj-$(CONFIG_IRQ_CROSSBAR)            += irq-crossbar.o
  obj-$(CONFIG_SOC_VF610)                       += irq-vf610-mscm-ir.o
 +obj-$(CONFIG_BCM6345_L1_IRQ)          += irq-bcm6345-l1.o
  obj-$(CONFIG_BCM7038_L1_IRQ)          += irq-bcm7038-l1.o
  obj-$(CONFIG_BCM7120_L2_IRQ)          += irq-bcm7120-l2.o
  obj-$(CONFIG_BRCMSTB_L2_IRQ)          += irq-brcmstb-l2.o
@@@ -60,3 -62,4 +63,4 @@@ obj-$(CONFIG_ARCH_SA1100)             += irq-sa11x
  obj-$(CONFIG_INGENIC_IRQ)             += irq-ingenic.o
  obj-$(CONFIG_IMX_GPCV2)                       += irq-imx-gpcv2.o
  obj-$(CONFIG_PIC32_EVIC)              += irq-pic32-evic.o
+ obj-$(CONFIG_MVEBU_ODMI)              += irq-mvebu-odmi.o