include: move interrupt controller headers to interrupt_controller/

nashif · nashif · commit 43a49335f42e · 2019-06-25T15:27:00.000-04:00
Move internal and architecture specific headers from include/drivers to
subfolder for interrupt_controller:

include/drivers/interrupt_controller/

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/drivers/counter/counter_qmsi_aonpt.c b/drivers/counter/counter_qmsi_aonpt.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <init.h>
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #include <counter.h>
 #include <power.h>
 #include <soc.h>
diff --git a/drivers/counter/counter_rtc_qmsi.c b/drivers/counter/counter_rtc_qmsi.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <device.h>
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #include <counter.h>
 #include <init.h>
 #include <kernel.h>
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
@@ -23,7 +23,7 @@
 #endif
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
diff --git a/drivers/gpio/gpio_qmsi.c b/drivers/gpio/gpio_qmsi.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <device.h>
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #include <gpio.h>
 #include <init.h>
 #include <sys_io.h>
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
@@ -23,7 +23,7 @@
 #include <misc/util.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 #include "i2c_dw.h"
diff --git a/drivers/i2c/i2c_qmsi.c b/drivers/i2c/i2c_qmsi.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <i2c.h>
-#include <ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #include <power.h>
 
 #include "qm_i2c.h"
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c
@@ -58,8 +58,8 @@
 #include <init.h>
 #include <string.h>
 
-#include <drivers/ioapic.h> /* public API declarations */
-#include <drivers/loapic.h> /* public API declarations and registers */
+#include <drivers/interrupt_controller/ioapic.h> /* public API declarations */
+#include <drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
 #include "ioapic_priv.h"
 
 #define BITS_PER_IRQ  3
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
@@ -17,9 +17,9 @@
 
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <drivers/loapic.h> /* public API declarations */
+#include <drivers/interrupt_controller/loapic.h> /* public API declarations */
 #include <init.h>
-#include <drivers/sysapic.h>
+#include <drivers/interrupt_controller/sysapic.h>
 
 /* Local APIC Version Register Bits */
 
diff --git a/drivers/interrupt_controller/shared_irq.c b/drivers/interrupt_controller/shared_irq.c
@@ -13,7 +13,7 @@
 #include <sys_io.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 /**
diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c
@@ -13,9 +13,9 @@
 #include <misc/__assert.h>
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <drivers/ioapic.h>
-#include <drivers/loapic.h>
-#include <drivers/sysapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
+#include <drivers/interrupt_controller/loapic.h>
+#include <drivers/interrupt_controller/sysapic.h>
 #include <irq.h>
 
 #define IS_IOAPIC_IRQ(irq)  (irq < LOAPIC_IRQ_BASE)
diff --git a/drivers/serial/uart_qmsi.c b/drivers/serial/uart_qmsi.c
@@ -7,7 +7,7 @@
 
 #include <device.h>
 #if defined(CONFIG_IOAPIC)
-#include <ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 #include <uart.h>
 #include <power.h>
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <misc/util.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 #include <spi.h>
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(spi_intel);
 #include "spi_intel.h"
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 static void completed(struct device *dev, u32_t error)
diff --git a/drivers/watchdog/wdt_qmsi.c b/drivers/watchdog/wdt_qmsi.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <kernel.h>
 #include <watchdog.h>
-#include <ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #include <power.h>
 #include <soc.h>
 
diff --git a/include/arch/x86/irq_controller.h b/include/arch/x86/irq_controller.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_
 #define ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_
 
-#include <drivers/sysapic.h>
+#include <drivers/interrupt_controller/sysapic.h>
 
 /* Triggering flags abstraction layer.
  * If a particular set of triggers is not supported, leave undefined
diff --git a/include/drivers/interrupt_controller/ioapic.h b/include/drivers/interrupt_controller/ioapic.h
diff --git a/include/drivers/interrupt_controller/loapic.h b/include/drivers/interrupt_controller/loapic.h
diff --git a/include/drivers/interrupt_controller/sysapic.h b/include/drivers/interrupt_controller/sysapic.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_
 #define ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_
 
-#include <drivers/loapic.h>
+#include <drivers/interrupt_controller/loapic.h>
 
 #define _IRQ_TRIGGER_EDGE	IOAPIC_EDGE
 #define _IRQ_TRIGGER_LEVEL	IOAPIC_LEVEL
diff --git a/soc/x86/intel_quark/quark_se/soc.h b/soc/x86/intel_quark/quark_se/soc.h
@@ -18,7 +18,7 @@
 #include <uart.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 #define INT_VEC_IRQ0  0x20	/* Vector number for IRQ0 */
diff --git a/soc/x86/intel_quark/quark_x1000/soc.c b/soc/x86/intel_quark/quark_x1000/soc.c
@@ -24,7 +24,7 @@
 #include <uart.h>
 #include <drivers/pci/pci.h>
 #include <drivers/pci/pci_mgr.h>
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 
 
 #ifdef CONFIG_PCI_LEGACY_BRIDGE
diff --git a/soc/x86/intel_quark/quark_x1000/soc.h b/soc/x86/intel_quark/quark_x1000/soc.h
@@ -23,7 +23,7 @@
 #endif
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/ioapic.h>
+#include <drivers/interrupt_controller/ioapic.h>
 #endif
 
 /*
