Commit dcc4aca5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ec' and 'acpi-button' 

Merge updates of the ACPI EC and button drivers for 6.15-rc2:

 - Add suspend-to-idle EC wakeup quirks for Lenovo Go S (Mario
   Limonciello).

 - Prevent ACPI button from sending spurions KEY_POWER events to user
   space in some cases after a recent update (Mario Limonciello).

* acpi-ec:
  ACPI: EC: Set ec_no_wakeup for Lenovo Go S

* acpi-button:
  ACPI: button: Only send `KEY_POWER` for `ACPI_BUTTON_NOTIFY_STATUS`
parents 7ab4f0e3 b9886853 a8605b0e

drivers/acpi/button.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) 
	acpi_pm_wakeup_event(&device->dev);



	button = acpi_driver_data(device);

	if (button->suspended)

	if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE)

		return;



	input = button->input;

drivers/acpi/ec.c

+28 −0
Original line number Diff line number Diff line
@@ -2301,6 +2301,34 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = { 
			DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"),

		},

	},

	/*

	 * Lenovo Legion Go S; touchscreen blocks HW sleep when woken up from EC

	 * https://gitlab.freedesktop.org/drm/amd/-/issues/3929

	 */

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83L3"),

		}

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83N6"),

		}

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83Q2"),

		}

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"),

		}

	},

	{ },

};