summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/intel/wifi/wifi.c6
-rw-r--r--src/drivers/wifi/generic/chip.h2
-rw-r--r--src/drivers/wifi/generic/generic.c2
-rw-r--r--src/mainboard/google/dedede/variants/madoo/overridetree.cb1
-rw-r--r--src/mainboard/google/dedede/variants/magolor/overridetree.cb1
-rw-r--r--src/mainboard/google/dedede/variants/waddledee/overridetree.cb1
6 files changed, 3 insertions, 10 deletions
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index cc58ac6187..3c90dde5d3 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -49,11 +49,9 @@ static void intel_wifi_fill_ssdt(const struct device *dev)
struct drivers_intel_wifi_config *config = dev->chip_info;
struct drivers_wifi_generic_config generic_config;
- if (config) {
+ if (config)
generic_config.wake = config->wake;
- /* By default, all intel wifi chips wake from S3 */
- generic_config.maxsleep = 3;
- }
+
wifi_generic_fill_ssdt(dev, config ? &generic_config : NULL);
}
#endif
diff --git a/src/drivers/wifi/generic/chip.h b/src/drivers/wifi/generic/chip.h
index fe3a1d1b99..02ab504daf 100644
--- a/src/drivers/wifi/generic/chip.h
+++ b/src/drivers/wifi/generic/chip.h
@@ -6,11 +6,9 @@
/**
* struct drivers_wifi_generic_config - Data structure to contain generic wifi config
* @wake: Wake pin for ACPI _PRW
- * @maxsleep: Maximum sleep state to wake from
*/
struct drivers_wifi_generic_config {
unsigned int wake;
- unsigned int maxsleep;
};
/**
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index 2ecaadc5f7..0705731e58 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -189,7 +189,7 @@ void wifi_generic_fill_ssdt(const struct device *dev,
/* Wake capabilities */
if (config)
- acpigen_write_PRW(config->wake, config->maxsleep);
+ acpigen_write_PRW(config->wake, ACPI_S3);
/* Fill regulatory domain structure */
if (CONFIG(HAVE_REGULATORY_DOMAIN)) {
diff --git a/src/mainboard/google/dedede/variants/madoo/overridetree.cb b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
index 039fd108b3..257f91722e 100644
--- a/src/mainboard/google/dedede/variants/madoo/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
@@ -103,7 +103,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03"
- register "maxsleep" = "3"
device pci 00.0 on end
end
end # PCI Express Root Port 8 - WLAN
diff --git a/src/mainboard/google/dedede/variants/magolor/overridetree.cb b/src/mainboard/google/dedede/variants/magolor/overridetree.cb
index 8a83b83028..f41e9fab6b 100644
--- a/src/mainboard/google/dedede/variants/magolor/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/magolor/overridetree.cb
@@ -287,7 +287,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03"
- register "maxsleep" = "3"
device pci 00.0 on end
end
end # PCI Express Root Port 8 - WLAN
diff --git a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb
index a525a0f2c5..22a08a060e 100644
--- a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb
@@ -147,7 +147,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03"
- register "maxsleep" = "3"
device pci 00.0 on end
end
end # PCI Express Root Port 8 - WLAN