summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/acpi/pci_irqs.asl2
-rw-r--r--src/soc/intel/apollolake/acpi/soc_int.asl46
-rw-r--r--src/soc/intel/apollolake/include/soc/irq.h46
3 files changed, 47 insertions, 47 deletions
diff --git a/src/soc/intel/apollolake/acpi/pci_irqs.asl b/src/soc/intel/apollolake/acpi/pci_irqs.asl
index b323000317..c0ec1d461c 100644
--- a/src/soc/intel/apollolake/acpi/pci_irqs.asl
+++ b/src/soc/intel/apollolake/acpi/pci_irqs.asl
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include "soc_int.asl"
+#include <soc/irq.h>
Method(_PRT)
{
diff --git a/src/soc/intel/apollolake/acpi/soc_int.asl b/src/soc/intel/apollolake/acpi/soc_int.asl
deleted file mode 100644
index bdb0471be4..0000000000
--- a/src/soc/intel/apollolake/acpi/soc_int.asl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef _SOC_INT_DEFINE_ASL_
-#define _SOC_INT_DEFINE_ASL_
-
-#define SDCARD_INT 3 /* Need to be shared by PMC and SCC only*/
-#define UART0_INT 4 /* Need to be shared by PMC and SCC only*/
-#define UART1_INT 5 /* Need to be shared by PMC and SCC only*/
-#define UART2_INT 6 /* Need to be shared by PMC and SCC only*/
-#define UART3_INT 7 /* Need to be shared by PMC and SCC only*/
-#define XDCI_INT 13 /* Need to be shared by PMC and SCC only*/
-#define GPIO_BANK_INT 14
-#define NPK_INT 16
-#define PIRQA_INT 16
-#define PIRQB_INT 17
-#define PIRQC_INT 18
-#define SATA_INT 19
-#define GEN_INT 19
-#define PIRQD_INT 19
-#define XHCI_INT 17 /* Need to be shared by PMC and SCC only*/
-#define SMBUS_INT 20 /* PIRQE */
-#define CSE_INT 20 /* PIRQE */
-#define IUNIT_INT 21 /* PIRQF */
-#define PIRQF_INT 21
-#define PIRQG_INT 22
-#define PUNIT_INT 24
-#define AUDIO_INT 25
-#define ISH_INT 26
-#define I2C0_INT 27
-#define I2C1_INT 28
-#define I2C2_INT 29
-#define I2C3_INT 30
-#define I2C4_INT 31
-#define I2C5_INT 32
-#define I2C6_INT 33
-#define I2C7_INT 34
-#define SPI0_INT 35
-#define SPI1_INT 36
-#define SPI2_INT 37
-#define UFS_INT 38
-#define EMMC_INT 39
-#define PMC_INT 40
-#define SDIO_INT 42
-#define CNVI_INT 44
-
-#endif /* _SOC_INT_DEFINE_ASL_ */
diff --git a/src/soc/intel/apollolake/include/soc/irq.h b/src/soc/intel/apollolake/include/soc/irq.h
new file mode 100644
index 0000000000..f619865593
--- /dev/null
+++ b/src/soc/intel/apollolake/include/soc/irq.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _SOC_IRQ_H_
+#define _SOC_IRQ_H_
+
+#define SDCARD_INT 3 /* Need to be shared by PMC and SCC only*/
+#define UART0_INT 4 /* Need to be shared by PMC and SCC only*/
+#define UART1_INT 5 /* Need to be shared by PMC and SCC only*/
+#define UART2_INT 6 /* Need to be shared by PMC and SCC only*/
+#define UART3_INT 7 /* Need to be shared by PMC and SCC only*/
+#define XDCI_INT 13 /* Need to be shared by PMC and SCC only*/
+#define GPIO_BANK_INT 14
+#define NPK_INT 16
+#define PIRQA_INT 16
+#define PIRQB_INT 17
+#define PIRQC_INT 18
+#define SATA_INT 19
+#define GEN_INT 19
+#define PIRQD_INT 19
+#define XHCI_INT 17 /* Need to be shared by PMC and SCC only*/
+#define SMBUS_INT 20 /* PIRQE */
+#define CSE_INT 20 /* PIRQE */
+#define IUNIT_INT 21 /* PIRQF */
+#define PIRQF_INT 21
+#define PIRQG_INT 22
+#define PUNIT_INT 24
+#define AUDIO_INT 25
+#define ISH_INT 26
+#define I2C0_INT 27
+#define I2C1_INT 28
+#define I2C2_INT 29
+#define I2C3_INT 30
+#define I2C4_INT 31
+#define I2C5_INT 32
+#define I2C6_INT 33
+#define I2C7_INT 34
+#define SPI0_INT 35
+#define SPI1_INT 36
+#define SPI2_INT 37
+#define UFS_INT 38
+#define EMMC_INT 39
+#define PMC_INT 40
+#define SDIO_INT 42
+#define CNVI_INT 44
+
+#endif /* _SOC_IRQ_H_ */