sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into galp5

Browse Source 
Change-Id: I718ce2ea23c20405a0392793361cf3e52e864276
This commit is contained in:
Jeremy Soller
2020-11-20 10:30:40 -07:00
parent f786129104 982f64d1b7
commit 5352c7b0b2
313 changed files with 7247 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/acpi/acpi.c
View File

@@ -1251,14 +1251,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
/* should be 0 ACPI 3.0 */
fadt->reserved = 0;
if (CONFIG(SYSTEM_TYPE_CONVERTIBLE) ||
CONFIG(SYSTEM_TYPE_LAPTOP))
fadt->preferred_pm_profile = PM_MOBILE;
else if (CONFIG(SYSTEM_TYPE_DETACHABLE) ||
CONFIG(SYSTEM_TYPE_TABLET))
fadt->preferred_pm_profile = PM_TABLET;
else
fadt->preferred_pm_profile = PM_DESKTOP;
fadt->preferred_pm_profile = acpi_get_preferred_pm_profile();
arch_fill_fadt(fadt);
@@ -1626,7 +1619,7 @@ void *acpi_find_wakeup_vector(void)
void *wake_vec;
int i;
if (!acpi_is_wakeup())
if (!acpi_is_wakeup_s3())
return NULL;
printk(BIOS_DEBUG, "Trying to find the wakeup vector...\n");