diff options
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/facebook/fbg1701/acpi_tables.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/cyan/acpi_tables.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/jecht/dsdt.asl | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/strago/acpi_tables.c | 4 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/dsdt.asl | 1 | ||||
| -rw-r--r-- | src/mainboard/portwell/m107/acpi_tables.c | 4 |
6 files changed, 14 insertions, 4 deletions
diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c index 7538af0231..92db5b69db 100644 --- a/src/mainboard/facebook/fbg1701/acpi_tables.c +++ b/src/mainboard/facebook/fbg1701/acpi_tables.c @@ -5,6 +5,7 @@ #include <arch/ioapic.h> #include <soc/acpi.h> #include <soc/nvs.h> +#include <soc/device_nvs.h> void mainboard_fill_gnvs(struct global_nvs *gnvs) { @@ -20,7 +21,8 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->dpte = 0; /* PMIC is configured in I2C1, hide it for the OS */ - gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; + struct device_nvs *dev_nvs = acpi_get_device_nvs(); + dev_nvs->lpss_en[LPSS_NVS_I2C2] = 0; } unsigned long acpi_fill_madt(unsigned long current) 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> diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c index 97795cd0ea..a600d0a15b 100644 --- a/src/mainboard/intel/strago/acpi_tables.c +++ b/src/mainboard/intel/strago/acpi_tables.c @@ -7,6 +7,7 @@ #include <soc/acpi.h> #include <soc/iomap.h> #include <soc/nvs.h> +#include <soc/device_nvs.h> #include <boardid.h> #include "onboard.h" @@ -24,7 +25,8 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->dpte = 1; /* PMIC is configured in I2C1, hidden it from OS */ - gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; + struct device_nvs *dev_nvs = acpi_get_device_nvs(); + dev_nvs->lpss_en[LPSS_NVS_I2C2] = 0; } unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl index 7d58eb6930..37c07f3f4c 100644 --- a/src/mainboard/intel/wtm2/dsdt.asl +++ b/src/mainboard/intel/wtm2/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> diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c index 7538af0231..92db5b69db 100644 --- a/src/mainboard/portwell/m107/acpi_tables.c +++ b/src/mainboard/portwell/m107/acpi_tables.c @@ -5,6 +5,7 @@ #include <arch/ioapic.h> #include <soc/acpi.h> #include <soc/nvs.h> +#include <soc/device_nvs.h> void mainboard_fill_gnvs(struct global_nvs *gnvs) { @@ -20,7 +21,8 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->dpte = 0; /* PMIC is configured in I2C1, hide it for the OS */ - gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; + struct device_nvs *dev_nvs = acpi_get_device_nvs(); + dev_nvs->lpss_en[LPSS_NVS_I2C2] = 0; } unsigned long acpi_fill_madt(unsigned long current) |