summaryrefslogtreecommitdiffstats
path: root/src/soc/amd/common
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2024-01-26 14:41:14 +0100
committerFelix Held <felix-coreboot@felixheld.de>2024-01-27 16:39:21 +0000
commit0079200e8d45db31fcd0a2501f281809523329ca (patch)
tree8fa84b0ebad6e4e979ae7be4a1ea0f034474f483 /src/soc/amd/common
parentd9e826322031f5936231be44e3b2c406be40a304 (diff)
downloadcoreboot-0079200e8d45db31fcd0a2501f281809523329ca.tar.gz
coreboot-0079200e8d45db31fcd0a2501f281809523329ca.tar.bz2
coreboot-0079200e8d45db31fcd0a2501f281809523329ca.zip
soc/amd: use common ACPI_SCI_IRQ definition
ACPI_SCI_IRQ is defined as 9 for all AMD SoCs, so move the definition to the common amdblocks/acpi.h. Since all but Stoneyridge's soc/acpi.h are now empty, delete those files too. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I8210c98dc4cf2c6001d5273d132053278ff7fea5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80222 Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/common')
-rw-r--r--src/soc/amd/common/block/acpi/ivrs.c1
-rw-r--r--src/soc/amd/common/block/acpi/pm_state.c1
-rw-r--r--src/soc/amd/common/block/include/amdblocks/acpi.h2
-rw-r--r--src/soc/amd/common/block/lpc/lpc.c1
4 files changed, 2 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 547163c6ff51..9d0ece1d6ca9 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -12,7 +12,6 @@
#include <device/mmio.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
-#include <soc/acpi.h>
#include <soc/data_fabric.h>
#include <soc/iomap.h>
#include <soc/pci_devs.h>
diff --git a/src/soc/amd/common/block/acpi/pm_state.c b/src/soc/amd/common/block/acpi/pm_state.c
index ccfef0a7522d..23a7d45d8ee5 100644
--- a/src/soc/amd/common/block/acpi/pm_state.c
+++ b/src/soc/amd/common/block/acpi/pm_state.c
@@ -4,7 +4,6 @@
#include <acpi/acpi_pm.h>
#include <amdblocks/acpi.h>
#include <bootstate.h>
-#include <soc/acpi.h>
#include <soc/nvs.h>
#include <soc/southbridge.h>
#include <types.h>
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index 2a29f37c4f1b..8642d0f4f7fa 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -8,6 +8,8 @@
#include <device/device.h>
#include <types.h>
+#define ACPI_SCI_IRQ 9
+
/* ACPI MMIO registers 0xfed80800 */
#define MMIO_ACPI_PM1_EVT_BLK 0x00
#define MMIO_ACPI_PM1_STS 0x00
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 96b9a2c4e7b7..4e8131688123 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -17,7 +17,6 @@
#include <amdblocks/ioapic.h>
#include <amdblocks/iomap.h>
#include <amdblocks/lpc.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <soc/lpc.h>
#include <soc/southbridge.h>