hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'acpi-button' and 'acpi-dock' 

* acpi-button:
  ACPI: button: Drop no longer necessary Acer SW5-012 lid_init_state quirk

* acpi-dock:
  ACPI: dock: fix enum-conversion warning
This commit is contained in:
Rafael J. Wysocki 2020-10-30 16:31:20 +01:00
parent 85f971b65a 136a4dfe87 be0e975264
commit 8f7304bb91
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/acpi/button.c
View File

@ -73,19 +73,6 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);
/* Please keep this list sorted alphabetically by vendor and model */ /* Please keep this list sorted alphabetically by vendor and model */
static const struct dmi_system_id dmi_lid_quirks[] = { static const struct dmi_system_id dmi_lid_quirks[] = {
{
/*
* Acer Switch 10 SW5-012. _LID method messes with home and
* power button GPIO IRQ settings causing an interrupt storm on
* both GPIOs. This is unfixable without a DSDT override, so we
* have to disable the lid-switch functionality altogether :|
*/
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
},
.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
},
{ {
/* GP-electronic T701, _LID method points to a floating GPIO */ /* GP-electronic T701, _LID method points to a floating GPIO */
.matches = { .matches = {

3
drivers/acpi/dock.c
View File

@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
* between them). * between them).
*/ */
list_for_each_entry_reverse(dd, &ds->dependent_devices, list) list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false); dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
DOCK_CALL_HANDLER);
list_for_each_entry_reverse(dd, &ds->dependent_devices, list) list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
acpi_bus_trim(dd->adev); acpi_bus_trim(dd->adev);