Change in coreboot[master]: soc/intel/apollolake: Add irq.h

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44199 )

Change subject: soc/intel/apollolake: Add irq.h
......................................................................

soc/intel/apollolake: Add irq.h

Move defines from soc_int.asl to soc/irq.h.

The common code uart driver expect it to exist.

Change-Id: I000a041120daa8cbe1ca4e4aab48a206bb3e9245
Signed-off-by: Patrick Rudolph 
---
M src/soc/intel/apollolake/acpi/pci_irqs.asl
D src/soc/intel/apollolake/acpi/soc_int.asl
A src/soc/intel/apollolake/include/soc/irq.h
3 files changed, 47 insertions(+), 47 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/44199/1

diff --git a/src/soc/intel/apollolake/acpi/pci_irqs.asl b/src/soc/intel/apollolake/acpi/pci_irqs.asl
index b323000..c0ec1d4 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 bdb0471..0000000
--- 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 0000000..f619865
--- /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_ */

[Maxim Polyakov (Code Review)]

Maxim Polyakov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44199 )

Change subject: soc/intel/apollolake: Add irq.h
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44199 )

Change subject: soc/intel/apollolake: Add irq.h
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44199 )

Change subject: soc/intel/apollolake: Add irq.h
......................................................................

soc/intel/apollolake: Add irq.h

Move defines from soc_int.asl to soc/irq.h.

The common code uart driver expect it to exist.

Change-Id: I000a041120daa8cbe1ca4e4aab48a206bb3e9245
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44199
Tested-by: build bot (Jenkins) 
Reviewed-by: Maxim Polyakov 
Reviewed-by: Angel Pons 
---
M src/soc/intel/apollolake/acpi/pci_irqs.asl
D src/soc/intel/apollolake/acpi/soc_int.asl
A src/soc/intel/apollolake/include/soc/irq.h
3 files changed, 47 insertions(+), 47 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Maxim Polyakov: Looks good to me, approved

diff --git a/src/soc/intel/apollolake/acpi/pci_irqs.asl b/src/soc/intel/apollolake/acpi/pci_irqs.asl
index b323000..c0ec1d4 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 bdb0471..0000000
--- 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 0000000..f619865
--- /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_ */