From b6b5af11712b303dab085a5c7c11aa003d4842a8 Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Mon, 27 Feb 2023 21:15:16 +0100
Subject: mb/amd/gardenia,pademelon/mainboard: use ACPI_SCI_IRQ definition

Use the ACPI_SCI_IRQ definition for both the PIC and APIC IRQ number in
the fch_irq_map table. Before the PIC mapping was set to PIRQ_NC, but
both mb/google/kahlee and the other amd mainboards using newer SoCs set
both the PIC and APCI IRQ number to ACPI_SCI_IRQ, so change this here to
match the other mainboards.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I29dde7ca8d2ecf00d8174c2d793ef1ad55ae3e28
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73322
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/amd/gardenia/mainboard.c  | 3 ++-
 src/mainboard/amd/pademelon/mainboard.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index 39f16972ec..d89449f6fa 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -4,6 +4,7 @@
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
 #include <gpio.h>
+#include <soc/acpi.h>
 #include <soc/southbridge.h>
 
 #include "gpio.h"
@@ -19,7 +20,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
 	{ PIRQ_F,	10,		21 },
 	{ PIRQ_G,	PIRQ_NC,	22 },
 	{ PIRQ_H,	PIRQ_NC,	23 },
-	{ PIRQ_SCI,	PIRQ_NC,	 9 },
+	{ PIRQ_SCI,	ACPI_SCI_IRQ,	ACPI_SCI_IRQ },
 	{ PIRQ_SMBUS,	PIRQ_NC,	PIRQ_NC },
 	{ PIRQ_HDA,	 3,		16 },
 	{ PIRQ_SD,	PIRQ_NC,	16 },
diff --git a/src/mainboard/amd/pademelon/mainboard.c b/src/mainboard/amd/pademelon/mainboard.c
index d10de260b1..8be12f183c 100644
--- a/src/mainboard/amd/pademelon/mainboard.c
+++ b/src/mainboard/amd/pademelon/mainboard.c
@@ -4,6 +4,7 @@
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
 #include <gpio.h>
+#include <soc/acpi.h>
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 
@@ -20,7 +21,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
 	{ PIRQ_F,	10,		21 },
 	{ PIRQ_G,	PIRQ_NC,	22 },
 	{ PIRQ_H,	PIRQ_NC,	23 },
-	{ PIRQ_SCI,	PIRQ_NC,	 9 },
+	{ PIRQ_SCI,	ACPI_SCI_IRQ,	ACPI_SCI_IRQ },
 	{ PIRQ_SMBUS,	PIRQ_NC,	PIRQ_NC },
 	{ PIRQ_HDA,	 3,		16 },
 	{ PIRQ_SD,	PIRQ_NC,	16 },
-- 
cgit v1.2.3