diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-12 17:46:30 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-01-27 10:25:03 +0000 |
| commit | 4abc73183134def757c553aa4eb195fffa824100 (patch) | |
| tree | e6fa253f8e7dc46e80a0a33ea903b4fe0be83419 /src/mainboard/google | |
| parent | aeffa86cc551110b62074fa6302f4960d87a9a8c (diff) | |
ACPI: Separate device_nvs_t
Remove typedef device_nvs_t and move struct device_nvs
outside of global_nvs. Also remove padding and the reserve
for chromeos_acpi_t.
Change-Id: I878746b1f0f9152a27dc58e373d58115e2dff22c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49476
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/cyan/acpi_tables.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/jecht/dsdt.asl | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c index e70290873b..08f21ba1cf 100644 --- a/src/mainboard/google/cyan/acpi_tables.c +++ b/src/mainboard/google/cyan/acpi_tables.c @@ -6,6 +6,7 @@ #include <boardid.h> #include <soc/acpi.h> #include <soc/nvs.h> +#include <soc/device_nvs.h> void mainboard_fill_gnvs(struct global_nvs *gnvs) { @@ -21,8 +22,9 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->dpte = 1; /* Disable PMIC I2C port for ACPI for all boards except cyan */ + struct device_nvs *dev_nvs = acpi_get_device_nvs(); if (!CONFIG(BOARD_GOOGLE_CYAN)) - gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; + dev_nvs->lpss_en[LPSS_NVS_I2C2] = 0; gnvs->bdid = board_id(); } diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index 05754ca5c0..996c035319 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -18,6 +18,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/broadwell/pch/acpi/globalnvs.asl> + #include <soc/intel/broadwell/acpi/device_nvs.asl> // CPU #include <cpu/intel/common/acpi/cpu.asl> |