aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/xeon_sp/skx
diff options
context:
space:
mode:
authorMarc Jones <marcjones@sysproconsulting.com>2020-10-19 13:46:59 -0600
committerMarc Jones <marc@marcjonesconsulting.com>2020-10-22 21:35:11 +0000
commit521a03f30331ff89f3ac8d94cad03b8443ebf4ff (patch)
treef56d4f6ac15d2d42a5541df4e29e76f68f083d1f /src/soc/intel/xeon_sp/skx
parent8066fda9ed53da095b17188e3b96265810534985 (diff)
soc/intel/xeon_sp: Move uncore_inject_dsdt() call
Prepare for common ACPI code. Move uncore_inject_dsdt() to the uncore device acpi_inject_dsdt call. Change-Id: Ida106238690eb1af17759ba6dbe4cb94344e3a94 Signed-off-by: Marc Jones <marcjones@sysproconsulting.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46596 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/soc/intel/xeon_sp/skx')
-rw-r--r--src/soc/intel/xeon_sp/skx/acpi.c3
-rw-r--r--src/soc/intel/xeon_sp/skx/soc_acpi.c6
2 files changed, 1 insertions, 8 deletions
diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index c446a51f8c..f0b7df9c38 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -247,9 +247,6 @@ void southbridge_inject_dsdt(const struct device *device)
acpigen_write_name_dword("NVSA", (uint32_t)gnvs);
acpigen_pop_len();
}
-
- // Add IIOStack ACPI Resource Templates
- uncore_inject_dsdt();
}
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index afbcf840bd..56ed0ce17b 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -55,11 +55,7 @@ uint32_t soc_read_sci_irq_select(void)
return pci_read_config32(dev, PMC_ACPI_CNT);
}
-/*
- * Currently called in southbridge_inject_dsdt(). Change to soc_southbridge_inject_dsdt()
- * with a call from the common/function or find another way to call this at the correct place
- */
-void uncore_inject_dsdt(void)
+void uncore_inject_dsdt(const struct device *device)
{
size_t hob_size;
const uint8_t uds_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;