soc/amd/picasso/include/acpi: introduce and use ACPI_SCI_IRQ definition

The newer AMD SoCs define ACPI_SCI_IRQ in the SoC's acpi.h header file
and use this definition in the mainboard code, so port this back to
Picasso.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ib569747aa388d7953e79de747905fb52c2a05e74
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71912
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Felix Held 2023-01-14 00:39:08 +01:00
parent c2ed1e9ba0
commit 8c41000862
4 changed files with 8 additions and 3 deletions

View File

@ -5,6 +5,7 @@
#include <amdblocks/amd_pci_util.h> #include <amdblocks/amd_pci_util.h>
#include <FspsUpd.h> #include <FspsUpd.h>
#include <gpio.h> #include <gpio.h>
#include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -26,7 +27,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_B, 10, 17 }, { PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 }, { PIRQ_C, 11, 18 },
{ PIRQ_D, 12, 19 }, { PIRQ_D, 12, 19 },
{ PIRQ_SCI, 9, 9 }, { PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ },
{ PIRQ_SD, PIRQ_NC, 16 }, { PIRQ_SD, PIRQ_NC, 16 },
{ PIRQ_SDIO, PIRQ_NC, 16 }, { PIRQ_SDIO, PIRQ_NC, 16 },
{ PIRQ_SATA, PIRQ_NC, 19 }, { PIRQ_SATA, PIRQ_NC, 19 },

View File

@ -4,6 +4,7 @@
#include <device/device.h> #include <device/device.h>
#include <amdblocks/amd_pci_util.h> #include <amdblocks/amd_pci_util.h>
#include <FspsUpd.h> #include <FspsUpd.h>
#include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -21,7 +22,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_B, 10, 17 }, { PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 }, { PIRQ_C, 11, 18 },
{ PIRQ_D, 12, 19 }, { PIRQ_D, 12, 19 },
{ PIRQ_SCI, 9, 9 }, { PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ },
{ PIRQ_SD, PIRQ_NC, 16 }, { PIRQ_SD, PIRQ_NC, 16 },
{ PIRQ_SDIO, PIRQ_NC, 16 }, { PIRQ_SDIO, PIRQ_NC, 16 },
{ PIRQ_SATA, PIRQ_NC, 19 }, { PIRQ_SATA, PIRQ_NC, 19 },

View File

@ -11,6 +11,7 @@
#include <boardid.h> #include <boardid.h>
#include <gpio.h> #include <gpio.h>
#include <smbios.h> #include <smbios.h>
#include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/platform_descriptors.h> #include <soc/platform_descriptors.h>
@ -52,7 +53,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_G, 13, PIRQ_NC }, { PIRQ_G, 13, PIRQ_NC },
{ PIRQ_H, 6, PIRQ_NC }, { PIRQ_H, 6, PIRQ_NC },
{ PIRQ_SCI, 9, 9 }, { PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ },
{ PIRQ_EMMC, 5, 5 }, { PIRQ_EMMC, 5, 5 },
{ PIRQ_GPIO, 7, 7 }, { PIRQ_GPIO, 7, 7 },
{ PIRQ_I2C2, 10, 10 }, { PIRQ_I2C2, 10, 10 },

View File

@ -8,6 +8,8 @@
#include <device/device.h> #include <device/device.h>
#include <stdint.h> #include <stdint.h>
#define ACPI_SCI_IRQ 9
/* RTC Registers */ /* RTC Registers */
#define RTC_DATE_ALARM 0x0d #define RTC_DATE_ALARM 0x0d