summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorHannah Williams <hannah.williams@intel.com>2017-06-24 08:33:15 -0700
committerMartin Roth <martinroth@google.com>2017-07-28 16:27:53 +0000
commita61884a8a1338c0e6128cf050827c5d1cd5ef8f3 (patch)
tree6b2279a81a15f8bbbc25ed2a7fc39073264b16e4 /src/soc/intel
parent3c6377fb4fcdff89e1509e9eeab7ce563dc45053 (diff)
soc/intel/apollolake: Add CNVI and PCIE IRQs for GLK
Change-Id: I0387ccf6970e6169cbebd232ae210731338d0900 Signed-off-by: Hannah Williams <hannah.williams@intel.com> Reviewed-on: https://review.coreboot.org/20755 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/apollolake/acpi/pci_irqs.asl10
-rw-r--r--src/soc/intel/apollolake/acpi/soc_int.asl3
2 files changed, 13 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/acpi/pci_irqs.asl b/src/soc/intel/apollolake/acpi/pci_irqs.asl
index 22878c673f..2475db39a1 100644
--- a/src/soc/intel/apollolake/acpi/pci_irqs.asl
+++ b/src/soc/intel/apollolake/acpi/pci_irqs.asl
@@ -30,6 +30,15 @@ Method(_PRT)
Package(){0x000FFFFF, 0, 0, CSE_INT},
Package(){0x0011FFFF, 0, 0, ISH_INT},
Package(){0x0012FFFF, 0, 0, SATA_INT},
+#if IS_ENABLED(CONFIG_SOC_INTEL_GLK)
+ Package(){0x000CFFFF, 0, 0, CNVI_INT},
+ Package(){0x0013FFFF, 0, 0, PIRQF_INT},
+ Package(){0x0013FFFF, 1, 0, PIRQF_INT},
+ Package(){0x0013FFFF, 2, 0, PIRQF_INT},
+ Package(){0x0013FFFF, 3, 0, PIRQF_INT},
+ Package(){0x0014FFFF, 0, 0, PIRQG_INT},
+ Package(){0x0014FFFF, 1, 0, PIRQG_INT},
+#else
Package(){0x0013FFFF, 0, 0, PIRQA_INT},
Package(){0x0013FFFF, 1, 0, PIRQB_INT},
Package(){0x0013FFFF, 2, 0, PIRQC_INT},
@@ -38,6 +47,7 @@ Method(_PRT)
Package(){0x0014FFFF, 1, 0, PIRQC_INT},
Package(){0x0014FFFF, 2, 0, PIRQD_INT},
Package(){0x0014FFFF, 3, 0, PIRQA_INT},
+#endif
Package(){0x0015FFFF, 0, 0, XHCI_INT},
Package(){0x0015FFFF, 1, 0, XDCI_INT},
Package(){0x0016FFFF, 0, 0, I2C0_INT},
diff --git a/src/soc/intel/apollolake/acpi/soc_int.asl b/src/soc/intel/apollolake/acpi/soc_int.asl
index c64324478a..11b5460c19 100644
--- a/src/soc/intel/apollolake/acpi/soc_int.asl
+++ b/src/soc/intel/apollolake/acpi/soc_int.asl
@@ -36,6 +36,8 @@
#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
@@ -54,5 +56,6 @@
#define EMMC_INT 39
#define PMC_INT 40
#define SDIO_INT 42
+#define CNVI_INT 44
#endif /* _SOC_INT_DEFINE_ASL_ */