Merge branch 'irq/gic-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm...

Pull the GIC related updates from Marc Zyngier:

 "Not a lot this time (what a relief!), but an interesting series from
  Linus Walleij coming out of his work converting the ARM RealView
  platforms to DT, and a couple of mundane fixes."

diff --combined drivers/irqchip/Kconfig
index b205e158e864879f90ec4c5d217247f95a521b55,bf29a8b2b7c56c91d046ed9e5d83aa18138d8710..b5f51337ba743b05318c8793895820a080b30f58
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -8,6 -8,11 +8,11 @@@ config ARM_GI
        select IRQ_DOMAIN_HIERARCHY
        select MULTI_IRQ_HANDLER
  
+ config ARM_GIC_MAX_NR
+       int
+       default 2 if ARCH_REALVIEW
+       default 1
+ 
  config ARM_GIC_V2M
        bool
        depends on ARM_GIC
@@@ -27,14 -32,6 +32,14 @@@ config ARM_GIC_V3_IT
        bool
        select PCI_MSI_IRQ_DOMAIN
  
 +config HISILICON_IRQ_MBIGEN
 +      bool "Support mbigen interrupt controller"
 +      default n
 +      depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
 +      help
 +       Enable the mbigen interrupt controller used on
 +       Hisilicon platform.
 +
  config ARM_NVIC
        bool
        select IRQ_DOMAIN

diff --combined drivers/irqchip/Makefile
index cd76b11682ebc90b734533793822ebe87e19a30d,c3f58db1108327c503f71497d1cec7d6be7a1e4c..83d1fce13e86945546fe9cf3fca7044fa4df2b81
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -21,10 -21,10 +21,11 @@@ obj-$(CONFIG_ARCH_SUNXI)           += irq-sun4i.
  obj-$(CONFIG_ARCH_SUNXI)              += irq-sunxi-nmi.o
  obj-$(CONFIG_ARCH_SPEAR3XX)           += spear-shirq.o
  obj-$(CONFIG_ARM_GIC)                 += irq-gic.o irq-gic-common.o
+ obj-$(CONFIG_REALVIEW_DT)             += irq-gic-realview.o
  obj-$(CONFIG_ARM_GIC_V2M)             += irq-gic-v2m.o
  obj-$(CONFIG_ARM_GIC_V3)              += irq-gic-v3.o irq-gic-common.o
  obj-$(CONFIG_ARM_GIC_V3_ITS)          += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o
 +obj-$(CONFIG_HISILICON_IRQ_MBIGEN)    += irq-mbigen.o
  obj-$(CONFIG_ARM_NVIC)                        += irq-nvic.o
  obj-$(CONFIG_ARM_VIC)                 += irq-vic.o
  obj-$(CONFIG_ATMEL_AIC_IRQ)           += irq-atmel-aic-common.o irq-atmel-aic.o