summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/kahlee/dsdt.asl2
-rw-r--r--src/soc/amd/stoneyridge/acpi/globalnvs.asl13
-rw-r--r--src/soc/amd/stoneyridge/include/soc/nvs.h15
3 files changed, 15 insertions, 15 deletions
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 17acb273d3..8a88848034 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -16,6 +16,8 @@ DefinitionBlock (
#include <acpi/dsdt_top.asl>
#include <globalnvs.asl>
+ Name(LIDS, 0)
+
/* Globals for the platform */
#include <variant/acpi/mainboard.asl>
diff --git a/src/soc/amd/stoneyridge/acpi/globalnvs.asl b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
index 703e16f58c..7f3fe1b633 100644
--- a/src/soc/amd/stoneyridge/acpi/globalnvs.asl
+++ b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
@@ -9,13 +9,12 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- LIDS, 8, // 0x00 - LID State
- CBMC, 32, // 0x01 - 0x04 - coreboot Memory Console
- PM1I, 64, // 0x05 - 0x0c - System Wake Source - PM1 Index
- GPEI, 64, // 0x0d - 0x14 - GPE Wake Source
- TMPS, 8, // 0x15 - Temperature Sensor ID
- TCRT, 8, // 0x16 - Critical Threshold
- TPSV, 8, // 0x17 - Passive Threshold
+ CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
+ GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
+ TMPS, 8, // 0x14 - Temperature Sensor ID
+ TCRT, 8, // 0x15 - Critical Threshold
+ TPSV, 8, // 0x16 - Passive Threshold
Offset (0x20), // 0x20 - AOAC Device Enables
, 5,
IC0E, 1, // I2C0, 5
diff --git a/src/soc/amd/stoneyridge/include/soc/nvs.h b/src/soc/amd/stoneyridge/include/soc/nvs.h
index d296458399..eaaf1bdc39 100644
--- a/src/soc/amd/stoneyridge/include/soc/nvs.h
+++ b/src/soc/amd/stoneyridge/include/soc/nvs.h
@@ -14,14 +14,13 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint8_t lids; /* 0x00 - LID State */
- uint32_t cbmc; /* 0x01 - 0x04 - coreboot Memory Console */
- uint64_t pm1i; /* 0x05 - 0x0c - System Wake Source - PM1 Index */
- uint64_t gpei; /* 0x0d - 0x14 - GPE Wake Source */
- uint8_t tmps; /* 0x15 - Temperature Sensor ID */
- uint8_t tcrt; /* 0x16 - Critical Threshold */
- uint8_t tpsv; /* 0x17 - Passive Threshold */
- uint8_t pad1[8];
+ uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
+ uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
+ uint8_t tmps; /* 0x14 - Temperature Sensor ID */
+ uint8_t tcrt; /* 0x15 - Critical Threshold */
+ uint8_t tpsv; /* 0x16 - Passive Threshold */
+ uint8_t pad1[9];
aoac_devs_t aoac; /* 0x20 - AOAC device enables */
uint16_t fw00; /* 0x24 - XhciFwRomAddr_Rom, Boot RAM */
uint16_t fw02; /* 0x26 - XhciFwRomAddr_Ram, Instr RAM */