irqchip: Define EXYNOS_IRQ_COMBINER

This patch is written to clean up dependency of ARCH_EXYNOS
Not all exynos device have IRQ_COMBINER, especially aarch64 EXYNOS
but it is built for all exynos devices.
Thus add the config for EXYNOS_IRQ_COMBINER
remove direct dependency between ARCH_EXYNOS and exynos-combiner.c
and only selected on the aarch32 devices

Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20191224211108.7128-1-hyunki00.koo@gmail.com

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4ef56571145bf5ef20862368ed70372d8b7a8315..6e7f10c8098ac5fc2a2ca3853e3ca2a0b4257fcd 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -12,6 +12,7 @@ menuconfig ARCH_EXYNOS
        select ARCH_SUPPORTS_BIG_ENDIAN
        select ARM_AMBA
        select ARM_GIC
+       select EXYNOS_IRQ_COMBINER
        select COMMON_CLK_SAMSUNG
        select EXYNOS_ASV
        select EXYNOS_CHIPID

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index bb89dfc82c6e4a06f3f1b167d3aac7b567668776..20c62d759aa443c57834129ecfcb0fe53d9bb613 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -500,4 +500,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

diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 6c9262c673bf0f8727f6a9fb3adb687b8bd92c72..4b1c5113e5e47c26ffa0ef7524f05ffdaf946043 100644 (file)
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_ARCH_BCM2835)              += irq-bcm2835.o
 obj-$(CONFIG_ARCH_BCM2835)             += irq-bcm2836.o
 obj-$(CONFIG_DAVINCI_AINTC)            += irq-davinci-aintc.o
 obj-$(CONFIG_DAVINCI_CP_INTC)          += irq-davinci-cp-intc.o
-obj-$(CONFIG_ARCH_EXYNOS)              += exynos-combiner.o
+obj-$(CONFIG_EXYNOS_IRQ_COMBINER)      += exynos-combiner.o
 obj-$(CONFIG_FARADAY_FTINTC010)                += irq-ftintc010.o
 obj-$(CONFIG_ARCH_HIP04)               += irq-hip04.o
 obj-$(CONFIG_ARCH_LPC32XX)             += irq-lpc32xx.o