platform: remove drivers/interrupt.h for Intel platforms

The interrupt.h interface is no longer used by any Intel platform as all drivers have been replaced with native Zephyr drivers, so these definitions are no longer needed. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
thesofproject · Apr 15, 2024 · 0db7caa · 0db7caa
1 parent c592f78
commit 0db7caa
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 250 deletions.
diff --git a/src/platform/intel/ace/include/ace/drivers/interrupt.h b/src/platform/intel/ace/include/ace/drivers/interrupt.h
diff --git a/src/platform/intel/cavs/include/cavs/drivers/interrupt.h b/src/platform/intel/cavs/include/cavs/drivers/interrupt.h
diff --git a/src/platform/meteorlake/include/platform/drivers/interrupt.h b/src/platform/meteorlake/include/platform/drivers/interrupt.h
diff --git a/src/platform/tigerlake/include/platform/drivers/interrupt.h b/src/platform/tigerlake/include/platform/drivers/interrupt.h
diff --git a/zephyr/include/rtos/interrupt.h b/zephyr/include/rtos/interrupt.h
@@ -19,12 +19,6 @@
 
 #include <sof/trace/trace.h>
 
-#ifdef CONFIG_CAVS
-/* to be removed once driver upstream in Zephyr */
-#define __SOF_DRIVERS_INTERRUPT_H__
-#include <platform/drivers/interrupt.h>
-#endif /* CONFIG_CAVS */
-
 extern struct tr_ctx zephyr_tr;
 
 static inline int interrupt_register(uint32_t irq, void(*handler)(void *arg), void *arg)
@@ -49,12 +43,9 @@ static inline void interrupt_unregister(uint32_t irq, const void *arg)
 	irq_disable(irq);
 }
 
-/*
- * CAVS IRQs are multilevel
- */
 static inline int interrupt_get_irq(unsigned int irq, const char *cascade)
 {
-#if defined(CONFIG_LIBRARY) || defined(CONFIG_ACE) || \
+#if defined(CONFIG_LIBRARY) || defined(CONFIG_ACE) || defined(CONFIG_CAVS) || \
 	defined(CONFIG_ZEPHYR_POSIX) || defined(CONFIG_ARM64)
 	return irq;
 #else