Skip to content

Commit b8b3b0b

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'intel-gpio-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current
intel-gpio for v6.2-2 * Ignore spurious wakeup by touchpad on Clevo NH5xAx * Miscellaneous fix(es)
2 parents 2f43f60 + a69982c commit b8b3b0b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

drivers/gpio/gpiolib-acpi.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,18 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
16371637
.ignore_wake = "ELAN0415:00@9",
16381638
},
16391639
},
1640+
{
1641+
/*
1642+
* Spurious wakeups from TP_ATTN# pin
1643+
* Found in BIOS 1.7.7
1644+
*/
1645+
.matches = {
1646+
DMI_MATCH(DMI_BOARD_NAME, "NH5xAx"),
1647+
},
1648+
.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
1649+
.ignore_wake = "SYNA1202:00@16",
1650+
},
1651+
},
16401652
{} /* Terminating entry */
16411653
};
16421654

drivers/gpio/gpiolib-acpi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#include <linux/gpio/consumer.h>
1616

17-
struct acpi_device;
1817
struct device;
1918
struct fwnode_handle;
2019

0 commit comments

Comments
 (0)