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`
Unified · Split
| @@ -458,7 +458,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) · 457 unmodified lines | |||
| 458 | acpi_pm_wakeup_event(&device->dev); | 458 | acpi_pm_wakeup_event(&device->dev); |
| 459 | 459 | ||
| 460 | button = acpi_driver_data(device); | 460 | button = acpi_driver_data(device); |
| 461 | if (button->suspended) | 461 | if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE) |
| 462 | return; | 462 | return; |
| 463 | 463 | ||
| 464 | input = button->input; | 464 | input = button->input; |
| @@ -2301,6 +2301,34 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = { · 2300 unmodified lines | |||
| 2301 | DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"), | 2301 | DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"), |
| 2302 | }, | 2302 | }, |
| 2303 | }, | 2303 | }, |
| 2304 | /* | ||
| 2305 | * Lenovo Legion Go S; touchscreen blocks HW sleep when woken up from EC | ||
| 2306 | * https://gitlab.freedesktop.org/drm/amd/-/issues/3929 | ||
| 2307 | */ | ||
| 2308 | { | ||
| 2309 | .matches = { | ||
| 2310 | DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), | ||
| 2311 | DMI_MATCH(DMI_PRODUCT_NAME, "83L3"), | ||
| 2312 | } | ||
| 2313 | }, | ||
| 2314 | { | ||
| 2315 | .matches = { | ||
| 2316 | DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), | ||
| 2317 | DMI_MATCH(DMI_PRODUCT_NAME, "83N6"), | ||
| 2318 | } | ||
| 2319 | }, | ||
| 2320 | { | ||
| 2321 | .matches = { | ||
| 2322 | DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), | ||
| 2323 | DMI_MATCH(DMI_PRODUCT_NAME, "83Q2"), | ||
| 2324 | } | ||
| 2325 | }, | ||
| 2326 | { | ||
| 2327 | .matches = { | ||
| 2328 | DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), | ||
| 2329 | DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"), | ||
| 2330 | } | ||
| 2331 | }, | ||
| 2304 | { }, | 2332 | { }, |
| 2305 | }; | 2333 | }; |
| 2306 | 2334 | ||