Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-drm-fsl-dcu.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index d5bafdd5f01fdf7f252262468f24acedbc74a670..715923d5236cc9a3cb721d2f91508e420d64ff47 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -8,6 +8,11 @@ config ARM_GIC
        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,6 +32,14 @@ config ARM_GIC_V3_ITS
        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
@@ -143,6 +156,12 @@ config TB10X_IRQC
        select IRQ_DOMAIN
        select GENERIC_IRQ_CHIP
 
+config TS4800_IRQ
+       tristate "TS-4800 IRQ controller"
+       select IRQ_DOMAIN
+       help
+         Support for the TS-4800 FPGA IRQ controller
+
 config VERSATILE_FPGA_IRQ
        bool
        select IRQ_DOMAIN