Merge tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux-2.6-block.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index fb50911b3940c0bd7234a1312e320ccff020f492..7e8c441ff2de3a66207f933e09a88e5c44a7ab07 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -60,6 +60,17 @@ config ARM_VIC_NR
          The maximum number of VICs available in the system, for
          power management.
 
+config ARMADA_370_XP_IRQ
+       bool
+       select GENERIC_IRQ_CHIP
+       select PCI_MSI_IRQ_DOMAIN if PCI_MSI
+
+config ALPINE_MSI
+       bool
+       depends on PCI && PCI_MSI
+       select GENERIC_IRQ_CHIP
+       select PCI_MSI_IRQ_DOMAIN
+
 config ATMEL_AIC_IRQ
        bool
        select GENERIC_IRQ_CHIP
@@ -78,6 +89,11 @@ config I8259
        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
@@ -151,6 +167,11 @@ config ST_IRQCHIP
        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
@@ -160,6 +181,7 @@ config TS4800_IRQ
        tristate "TS-4800 IRQ controller"
        select IRQ_DOMAIN
        depends on HAS_IOMEM
+       depends on SOC_IMX51 || COMPILE_TEST
        help
          Support for the TS-4800 FPGA IRQ controller
 
@@ -193,6 +215,8 @@ config KEYSTONE_IRQ
 
 config MIPS_GIC
        bool
+       select GENERIC_IRQ_IPI
+       select IRQ_DOMAIN_HIERARCHY
        select MIPS_CM
 
 config INGENIC_IRQ
@@ -218,3 +242,7 @@ config IRQ_MXS
        def_bool y if MACH_ASM9260 || ARCH_MXS
        select IRQ_DOMAIN
        select STMP_DEVICE
+
+config MVEBU_ODMI
+       bool
+       select GENERIC_MSI_IRQ_DOMAIN