diff options
Diffstat (limited to 'src/soc/intel/common/block')
-rw-r--r-- | src/soc/intel/common/block/acpi/acpi/globalnvs.asl | 2 | ||||
-rw-r--r-- | src/soc/intel/common/block/include/intelblocks/nvs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl index 18852d4bd1..d9ecfb3d84 100644 --- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl +++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl @@ -20,7 +20,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) DPTE, 8, // 0x1c - Enable DPTF NHLA, 64, // 0x1d - 0x24 NHLT Address NHLL, 32, // 0x25 - 0x28 NHLT Length - CID1, 16, // 0x29 - 0x2a Wifi Country Identifier + , 16, // 0x29 - 0x2a Wifi Country Identifier U2WE, 16, // 0x2b - 0x2c USB2 Wake Enable Bitmap U3WE, 16, // 0x2d - 0x2e USB3 Wake Enable Bitmap UIOR, 8, // 0x2f - UART debug controller init on S3 resume diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h index abc3400912..cba60f6040 100644 --- a/src/soc/intel/common/block/include/intelblocks/nvs.h +++ b/src/soc/intel/common/block/include/intelblocks/nvs.h @@ -20,7 +20,7 @@ struct __packed global_nvs { u8 dpte; /* 0x1c - Enable DPTF */ u64 nhla; /* 0x1d - 0x24 NHLT Address */ u32 nhll; /* 0x25 - 0x28 NHLT Length */ - u16 cid1; /* 0x29 - 0x2a Wifi Country Identifier */ + u16 unused_was_cid1; /* 0x29 - 0x2a Wifi Country Identifier */ u16 u2we; /* 0x2b - 0x2c USB2 Wake Enable Bitmap */ u16 u3we; /* 0x2d - 0x2e USB3 Wake Enable Bitmap */ u8 uior; /* 0x2f - UART debug controller init on S3 resume */ |