Merge tag 'for_v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 697e6a8ccaaed8df91074d18e4bbac31a8fb2792..1006c694d9fb8f34ca8187a6ef73958d637910bb 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -457,6 +457,12 @@ config IMX_IRQSTEER
        help
          Support for the i.MX IRQSTEER interrupt multiplexer/remapper.
 
+config IMX_INTMUX
+       def_bool y if ARCH_MXC
+       select IRQ_DOMAIN
+       help
+         Support for the i.MX INTMUX interrupt multiplexer.
+
 config LS1X_IRQ
        bool "Loongson-1 Interrupt Controller"
        depends on MACH_LOONGSON32
@@ -490,6 +496,7 @@ config TI_SCI_INTA_IRQCHIP
 config SIFIVE_PLIC
        bool "SiFive Platform-Level Interrupt Controller"
        depends on RISCV
+       select IRQ_DOMAIN_HIERARCHY
        help
           This enables support for the PLIC chip found in SiFive (and
           potentially other) RISC-V systems.  The PLIC controls devices
@@ -499,4 +506,11 @@ config SIFIVE_PLIC
 
           If you don't know what to do here, say Y.
 
+config EXYNOS_IRQ_COMBINER
+       bool "Samsung Exynos IRQ combiner support" if COMPILE_TEST
+       depends on (ARCH_EXYNOS && ARM) || COMPILE_TEST
+       help
+         Say yes here to add support for the IRQ combiner devices embedded
+         in Samsung Exynos chips.
+
 endmenu