diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2024-01-26 14:41:14 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-01-27 16:39:21 +0000 |
| commit | 0079200e8d45db31fcd0a2501f281809523329ca (patch) | |
| tree | 8fa84b0ebad6e4e979ae7be4a1ea0f034474f483 /src/mainboard/google | |
| parent | d9e826322031f5936231be44e3b2c406be40a304 (diff) | |
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/mainboard/google')
| -rw-r--r-- | src/mainboard/google/guybrush/mainboard.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/kahlee/mainboard.c | 1 | ||||
| -rw-r--r-- | src/mainboard/google/myst/mainboard.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/skyrim/mainboard.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/zork/mainboard.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c index af79a5e795..18d5e8f385 100644 --- a/src/mainboard/google/guybrush/mainboard.c +++ b/src/mainboard/google/guybrush/mainboard.c @@ -2,6 +2,7 @@ #include <acpi/acpi.h> #include <acpi/acpigen.h> +#include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/psp.h> @@ -12,7 +13,6 @@ #include <device/device.h> #include <drivers/i2c/tpm/chip.h> #include <gpio.h> -#include <soc/acpi.h> #include <variant/ec.h> #define BACKLIGHT_GPIO GPIO_129 diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index 5ddc5ae7dd..5ecc52eaa0 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/acpi.h> #include <string.h> #include <console/console.h> #include <device/device.h> diff --git a/src/mainboard/google/myst/mainboard.c b/src/mainboard/google/myst/mainboard.c index 36f5bab6ab..e5d285855e 100644 --- a/src/mainboard/google/myst/mainboard.c +++ b/src/mainboard/google/myst/mainboard.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/xhci.h> @@ -8,7 +9,6 @@ #include <cpu/x86/smm.h> #include <device/device.h> #include <drivers/i2c/tpm/chip.h> -#include <soc/acpi.h> #include <variant/ec.h> /* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c index 125bebbd82..8a395a8d67 100644 --- a/src/mainboard/google/skyrim/mainboard.c +++ b/src/mainboard/google/skyrim/mainboard.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/psp.h> @@ -9,7 +10,6 @@ #include <cpu/x86/smm.h> #include <device/device.h> #include <drivers/i2c/tpm/chip.h> -#include <soc/acpi.h> #include <variant/ec.h> /* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c index 74ed679d9b..4aa0c580a5 100644 --- a/src/mainboard/google/zork/mainboard.c +++ b/src/mainboard/google/zork/mainboard.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <amdblocks/acpi.h> #include <console/console.h> #include <device/device.h> #include <device/mmio.h> @@ -11,7 +12,6 @@ #include <boardid.h> #include <gpio.h> #include <smbios.h> -#include <soc/acpi.h> #include <soc/cpu.h> #include <soc/pci_devs.h> #include <soc/platform_descriptors.h> |