Skip to content

Commit e094883

Browse files
committed
Merge tag 'acpi-7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "New platform quirks for two systems: - Add a quirk for Lenovo G70-35 to save the ACPI NVS memory on system suspend (Piotr Mazek) - Add a DMI quirk for Acer Aspire One D255 to work around a backlight issue by returning false to _OSI("Windows 2009") (Sofia Schneider)" * tag 'acpi-7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: OSI: Add DMI quirk for Acer Aspire One D255 ACPI: PM: Save NVS memory on Lenovo G70-35
2 parents db5781c + 3d9b8b0 commit e094883

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

drivers/acpi/osi.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,19 @@ static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
389389
},
390390
},
391391

392+
/*
393+
* The screen backlight turns off during udev device creation
394+
* when returning true for _OSI("Windows 2009")
395+
*/
396+
{
397+
.callback = dmi_disable_osi_win7,
398+
.ident = "Acer Aspire One D255",
399+
.matches = {
400+
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
401+
DMI_MATCH(DMI_PRODUCT_NAME, "AOD255"),
402+
},
403+
},
404+
392405
/*
393406
* The wireless hotkey does not work on those machines when
394407
* returning true for _OSI("Windows 2012")

drivers/acpi/sleep.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
386386
DMI_MATCH(DMI_PRODUCT_NAME, "80E1"),
387387
},
388388
},
389+
{
390+
.callback = init_nvs_save_s3,
391+
.ident = "Lenovo G70-35",
392+
.matches = {
393+
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
394+
DMI_MATCH(DMI_PRODUCT_NAME, "80Q5"),
395+
},
396+
},
389397
/*
390398
* ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using
391399
* the Low Power S0 Idle firmware interface (see

0 commit comments

Comments
 (0)