diff options
Diffstat (limited to 'src/soc/intel/broadwell/pch/lpc.c')
| -rw-r--r-- | src/soc/intel/broadwell/pch/lpc.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index 8feae0f0a1..60c65cbaaa 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -12,7 +12,6 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> #include <cpu/x86/smm.h> -#include <cbmem.h> #include <string.h> #include <soc/gpio.h> #include <soc/iobp.h> @@ -603,24 +602,18 @@ static void pch_lpc_read_resources(struct device *dev) static void southcluster_inject_dsdt(const struct device *device) { - struct global_nvs *gnvs; - - gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); - - if (gnvs) { - acpi_create_gnvs(gnvs); + struct global_nvs *gnvs = acpi_get_gnvs(); + if (!gnvs) + return; - /* Set unknown wake source */ - gnvs->pm1i = -1; + /* Set unknown wake source */ + gnvs->pm1i = -1; - /* CPU core count */ - gnvs->pcnt = dev_count_cpu(); + /* CPU core count */ + gnvs->pcnt = dev_count_cpu(); - /* Add it to DSDT. */ - acpigen_write_scope("\\"); - acpigen_write_name_dword("NVSA", (u32) gnvs); - acpigen_pop_len(); - } + acpi_create_gnvs(gnvs); + acpi_inject_nvsa(); } static unsigned long broadwell_write_acpi_tables(const struct device *device, |