diff options
| -rw-r--r-- | src/soc/intel/alderlake/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/acpi.c | 4 | ||||
| -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 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/icelake/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/acpi.c | 4 |
11 files changed, 4 insertions, 32 deletions
diff --git a/src/soc/intel/alderlake/acpi.c b/src/soc/intel/alderlake/acpi.c index 9800563d81..1536de1f13 100644 --- a/src/soc/intel/alderlake/acpi.c +++ b/src/soc/intel/alderlake/acpi.c @@ -20,7 +20,6 @@ #include <soc/systemagent.h> #include <string.h> #include <types.h> -#include <wrdd.h> /* * List of supported C-states in this processor. @@ -278,9 +277,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index 37fe21672d..5b09b482d2 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -18,7 +18,6 @@ #include <soc/pm.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h> #include "chip.h" @@ -182,9 +181,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; 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 */ diff --git a/src/soc/intel/elkhartlake/acpi.c b/src/soc/intel/elkhartlake/acpi.c index ba64c0436c..0c87cfd398 100644 --- a/src/soc/intel/elkhartlake/acpi.c +++ b/src/soc/intel/elkhartlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h> /* * List of supported C-states in this processor. @@ -246,9 +245,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index 67b7ca513f..6240f68c9d 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/src/soc/intel/icelake/acpi.c @@ -16,7 +16,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h> /* * List of supported C-states in this processor. @@ -177,9 +176,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c index a3c2b259d6..1a9286a610 100644 --- a/src/soc/intel/jasperlake/acpi.c +++ b/src/soc/intel/jasperlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h> /* * List of supported C-states in this processor. @@ -273,9 +272,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 63fda6648e..10ce77e3bf 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -29,7 +29,6 @@ #include <soc/systemagent.h> #include <string.h> #include <types.h> -#include <wrdd.h> #include <device/pci_ops.h> #include "chip.h" @@ -166,9 +165,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl index d5b2c20745..1ae61fd62b 100644 --- a/src/soc/intel/skylake/acpi/globalnvs.asl +++ b/src/soc/intel/skylake/acpi/globalnvs.asl @@ -37,7 +37,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) DPTE, 8, // 0x30 - Enable DPTF NHLA, 64, // 0x31 - NHLT Address NHLL, 32, // 0x39 - NHLT Length - CID1, 16, // 0x3d - Wifi Country Identifier + , 16, // 0x3d - Wifi Country Identifier U2WE, 16, // 0x3f - USB2 Wake Enable Bitmap U3WE, 8, // 0x41 - USB3 Wake Enable Bitmap UIOR, 8, // 0x42 - UART debug controller init on S3 resume diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h index 39271d3549..21415189c5 100644 --- a/src/soc/intel/skylake/include/soc/nvs.h +++ b/src/soc/intel/skylake/include/soc/nvs.h @@ -37,7 +37,7 @@ struct __packed global_nvs { u8 dpte; /* 0x30 - Enable DPTF */ u64 nhla; /* 0x31 - NHLT Address */ u32 nhll; /* 0x39 - NHLT Length */ - u16 cid1; /* 0x3d - Wifi Country Identifier */ + u16 unused_was_cid1; /* 0x3d - Wifi Country Identifier */ u16 u2we; /* 0x3f - USB2 Wake Enable Bitmap */ u8 u3we; /* 0x41 - USB3 Wake Enable Bitmap */ u8 uior; /* 0x42 - UART debug controller init on S3 resume */ diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index f3e821f439..d81efb9c50 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h> /* * List of supported C-states in this processor. @@ -273,9 +272,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable; - /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; |