diff --git a/drivers/interrupt_controller/CMakeLists.txt b/drivers/interrupt_controller/CMakeLists.txt
index d38bf9dc618..09ad7edb6ad 100644
--- a/drivers/interrupt_controller/CMakeLists.txt
+++ b/drivers/interrupt_controller/CMakeLists.txt
@@ -20,7 +20,6 @@ zephyr_library_sources_ifdef(CONFIG_PLIC                    intc_plic.c)
 zephyr_library_sources_ifdef(CONFIG_RV32M1_INTMUX           intc_rv32m1_intmux.c)
 zephyr_library_sources_ifdef(CONFIG_SAM0_EIC                intc_sam0_eic.c)
 zephyr_library_sources_ifdef(CONFIG_SHARED_IRQ              intc_shared_irq.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_ESP32               intc_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_ESP32S2             intc_esp32.c)
+zephyr_library_sources_ifdef(CONFIG_INTC_ESP32              intc_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_SWERV_PIC               intc_swerv_pic.c)
 zephyr_library_sources_ifdef(CONFIG_VEXRISCV_LITEX_IRQ      intc_vexriscv_litex.c)
diff --git a/drivers/interrupt_controller/Kconfig.esp32 b/drivers/interrupt_controller/Kconfig.esp32
index f8e7f0e9629..147ffa02866 100644
--- a/drivers/interrupt_controller/Kconfig.esp32
+++ b/drivers/interrupt_controller/Kconfig.esp32
@@ -1,11 +1,18 @@
-# ESP32 Interrupt Allocator messages configuration
+# Espressif's Interrupt Allocator driver for Xtensa SoCs
 
 # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
+config INTC_ESP32
+	bool "Interrupt allocator for Xtensa-based Espressif SoCs"
+	default y if SOC_ESP32 || SOC_ESP32S2
+	help
+	  Enable custom interrupt allocator for Espressif SoCs based on Xtensa
+	  architecture.
+
 config INTC_ESP32_DECISIONS_LOG
-	bool "Enables ESP32 interrupt allocator logging"
-	depends on SOC_ESP32 || SOC_ESP32S2
+	bool "Enables Espressif's interrupt allocator logging"
+	depends on INTC_ESP32
 	select LOG
 	help
 	  Enable this option to visualize information on decisions made by the