diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index 9ae81896771..4cfb68b502c 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -21,7 +21,6 @@ add_subdirectory_if_kconfig(pwm)
 add_subdirectory_if_kconfig(rtc)
 add_subdirectory_if_kconfig(sensor)
 add_subdirectory_if_kconfig(serial)
-add_subdirectory_if_kconfig(shared_irq)
 add_subdirectory_if_kconfig(spi)
 add_subdirectory_if_kconfig(usb)
 add_subdirectory_if_kconfig(watchdog)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 0230321bdeb..0cd0c657463 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -33,7 +33,7 @@ source "drivers/pci/Kconfig"
 
 source "drivers/gpio/Kconfig"
 
-source "drivers/shared_irq/Kconfig"
+source "drivers/interrupt_controller/Kconfig.shared_irq"
 
 source "drivers/spi/Kconfig"
 
diff --git a/drivers/interrupt_controller/CMakeLists.txt b/drivers/interrupt_controller/CMakeLists.txt
index a6ebe8d9a05..97b321b9731 100644
--- a/drivers/interrupt_controller/CMakeLists.txt
+++ b/drivers/interrupt_controller/CMakeLists.txt
@@ -5,4 +5,5 @@ zephyr_sources_ifdef(CONFIG_LOAPIC_SPURIOUS_VECTOR  loapic_spurious.c)
 zephyr_sources_ifdef(CONFIG_MVIC                    mvic.c)
 zephyr_sources_ifdef(CONFIG_PIC_DISABLE             i8259.c)
 zephyr_sources_ifdef(CONFIG_PLIC_FE310              plic_fe310.c)
+zephyr_sources_ifdef(CONFIG_SHARED_IRQ              shared_irq.c)
 zephyr_sources_ifdef(CONFIG_SOC_FAMILY_STM32        exti_stm32.c)
diff --git a/drivers/shared_irq/Kconfig b/drivers/interrupt_controller/Kconfig.shared_irq
similarity index 100%
rename from drivers/shared_irq/Kconfig
rename to drivers/interrupt_controller/Kconfig.shared_irq
diff --git a/drivers/shared_irq/shared_irq.c b/drivers/interrupt_controller/shared_irq.c
similarity index 100%
rename from drivers/shared_irq/shared_irq.c
rename to drivers/interrupt_controller/shared_irq.c
diff --git a/drivers/shared_irq/CMakeLists.txt b/drivers/shared_irq/CMakeLists.txt
deleted file mode 100644
index c85dd015116..00000000000
--- a/drivers/shared_irq/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-zephyr_sources_if_kconfig(shared_irq.c)