[tip:,irq/core] irqchip/imx: IMX_INTMUX should not default to y, unconditionally
diff mbox series

Message ID 161340095388.20312.2760230142921071931.tip-bot2@tip-bot2
State Accepted
Commit a890caeb2ba40ca183969230e204ab144f258357
Headers show
  • [tip:,irq/core] irqchip/imx: IMX_INTMUX should not default to y, unconditionally
Related show

Commit Message

tip-bot2 for Wei Yongjun Feb. 15, 2021, 2:55 p.m. UTC
The following commit has been merged into the irq/core branch of tip:

Commit-ID:     a890caeb2ba40ca183969230e204ab144f258357
Gitweb:        https://git.kernel.org/tip/a890caeb2ba40ca183969230e204ab144f258357
Author:        Geert Uytterhoeven <geert+renesas@glider.be>
AuthorDate:    Mon, 08 Feb 2021 15:56:05 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Sun, 14 Feb 2021 12:01:16 

irqchip/imx: IMX_INTMUX should not default to y, unconditionally

Merely enabling CONFIG_COMPILE_TEST should not enable additional code.
To fix this, restrict the automatic enabling of IMX_INTMUX to ARCH_MXC,
and ask the user in case of compile-testing.

Fixes: 66968d7dfc3f5451 ("irqchip: Add COMPILE_TEST support for IMX_INTMUX")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210208145605.422943-1-geert+renesas@glider.be
 drivers/irqchip/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 030895c..da7b3cf 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -452,7 +452,8 @@  config IMX_IRQSTEER
 	  Support for the i.MX IRQSTEER interrupt multiplexer/remapper.
 config IMX_INTMUX
-	def_bool y if ARCH_MXC || COMPILE_TEST
+	bool "i.MX INTMUX support" if COMPILE_TEST
+	default y if ARCH_MXC
 	select IRQ_DOMAIN
 	  Support for the i.MX INTMUX interrupt multiplexer.