Commit e094883b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents db5781c4 3d9b8b00

drivers/acpi/osi.c

+13 −0
Original line number Diff line number Diff line
@@ -389,6 +389,19 @@ static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = { 
		},

	},



	/*

	 * The screen backlight turns off during udev device creation

	 * when returning true for _OSI("Windows 2009")

	 */

	{

	.callback = dmi_disable_osi_win7,

	.ident = "Acer Aspire One D255",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "AOD255"),

		},

	},



	/*

	 * The wireless hotkey does not work on those machines when

	 * returning true for _OSI("Windows 2012")

drivers/acpi/sleep.c

+8 −0
Original line number Diff line number Diff line
@@ -386,6 +386,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "80E1"),

		},

	},

	{

	.callback = init_nvs_save_s3,

	.ident = "Lenovo G70-35",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_NAME, "80Q5"),

		},

	},

	/*

	 * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using

	 * the Low Power S0 Idle firmware interface (see