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>

9 files changed, 9 insertions, 7 deletions

diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index 5e209462ae..ed4e706d45 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -2,10 +2,10 @@
 
 #include <console/console.h>
 #include <device/device.h>
+#include <amdblocks/acpi.h>
 #include <amdblocks/amd_pci_util.h>
 #include <FspsUpd.h>
 #include <gpio.h>
-#include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/southbridge.h>
 #include <soc/pci_devs.h>
diff --git a/src/mainboard/amd/birman/mainboard.c b/src/mainboard/amd/birman/mainboard.c
index e97bb31c6d..0deba6710f 100644
--- a/src/mainboard/amd/birman/mainboard.c
+++ b/src/mainboard/amd/birman/mainboard.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <amdblocks/amd_pci_util.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
-#include <soc/acpi.h>
 #include <types.h>
 #include "gpio.h"
 
diff --git a/src/mainboard/amd/chausie/mainboard.c b/src/mainboard/amd/chausie/mainboard.c
index 41e314aadc..c3eb70a806 100644
--- a/src/mainboard/amd/chausie/mainboard.c
+++ b/src/mainboard/amd/chausie/mainboard.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <amdblocks/amd_pci_util.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
-#include <soc/acpi.h>
 #include <types.h>
 #include "gpio.h"
 
diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index d89449f6fa..8353d82099 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <device/device.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
diff --git a/src/mainboard/amd/majolica/mainboard.c b/src/mainboard/amd/majolica/mainboard.c
index 9dbd4e42ee..5f5a90c193 100644
--- a/src/mainboard/amd/majolica/mainboard.c
+++ b/src/mainboard/amd/majolica/mainboard.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <amdblocks/amd_pci_util.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
-#include <soc/acpi.h>
 #include <types.h>
 
 /* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index d3b79e6134..7975c10c8c 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <amdblocks/amd_pci_util.h>
 #include <FspsUpd.h>
-#include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/southbridge.h>
 #include <soc/pci_devs.h>
diff --git a/src/mainboard/amd/mayan/mainboard.c b/src/mainboard/amd/mayan/mainboard.c
index 07853668f9..427c0855c1 100644
--- a/src/mainboard/amd/mayan/mainboard.c
+++ b/src/mainboard/amd/mayan/mainboard.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <amdblocks/amd_pci_util.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
-#include <soc/acpi.h>
 #include <types.h>
 #include "gpio.h"
 
diff --git a/src/mainboard/amd/onyx_poc/mainboard.c b/src/mainboard/amd/onyx_poc/mainboard.c
index af89e140b1..bc181ce395 100644
--- a/src/mainboard/amd/onyx_poc/mainboard.c
+++ b/src/mainboard/amd/onyx_poc/mainboard.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/acpi.h>
+#include <amdblocks/acpi.h>
 #include <soc/amd_pci_int_defs.h>
 #include <amdblocks/amd_pci_util.h>
 #include <types.h>
diff --git a/src/mainboard/amd/pademelon/mainboard.c b/src/mainboard/amd/pademelon/mainboard.c
index 8be12f183c..f4d5be964d 100644
--- a/src/mainboard/amd/pademelon/mainboard.c
+++ b/src/mainboard/amd/pademelon/mainboard.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/acpi.h>
 #include <device/device.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>