Commit b8b3b0bf authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'intel-gpio-v6.2-2' of... 

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)
parents 2f43f602 a69982c3

drivers/gpio/gpiolib-acpi.c

+12 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,18 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = { 
			.ignore_wake = "ELAN0415:00@9",

		},

	},

	{

		/*

		 * Spurious wakeups from TP_ATTN# pin

		 * Found in BIOS 1.7.7

		 */

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "NH5xAx"),

		},

		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {

			.ignore_wake = "SYNA1202:00@16",

		},

	},

	{} /* Terminating entry */

};

drivers/gpio/gpiolib-acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <linux/gpio/consumer.h>



struct acpi_device;

struct device;

struct fwnode_handle;