Commit 0903d098 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix an ACPI I2C HID driver breakage due to not initializing a
   structure on the stack and passing garbage down to GPIO core

 - ignore touchpad wakeup on GPD G1619-05

 - fix debouncing configuration when looking up GPIOs in ACPI

* tag 'gpio-fixes-for-v6.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: acpi: initialize acpi_gpio_info struct
  gpiolib: acpi: Ignore touchpad wakeup on GPD G1619-05
  gpiolib: acpi: Program debounce when finding GPIO
parents ffa7119c 2b464fd5

drivers/gpio/gpiolib-acpi-core.c

+9 −2
Original line number Diff line number Diff line
@@ -942,8 +942,9 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode, 
{

	struct acpi_device *adev = to_acpi_device_node(fwnode);

	bool can_fallback = acpi_can_fallback_to_crs(adev, con_id);

	struct acpi_gpio_info info;

	struct acpi_gpio_info info = {};

	struct gpio_desc *desc;

	int ret;



	desc = __acpi_find_gpio(fwnode, con_id, idx, can_fallback, &info);

	if (IS_ERR(desc))
@@ -957,6 +958,12 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode, 


	acpi_gpio_update_gpiod_flags(dflags, &info);

	acpi_gpio_update_gpiod_lookup_flags(lookupflags, &info);



	/* ACPI uses hundredths of milliseconds units */

	ret = gpio_set_debounce_timeout(desc, info.debounce * 10);

	if (ret)

		return ERR_PTR(ret);



	return desc;

}
@@ -992,7 +999,7 @@ int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id, 
	int ret;



	for (i = 0, idx = 0; idx <= index; i++) {

		struct acpi_gpio_info info;

		struct acpi_gpio_info info = {};

		struct gpio_desc *desc;



		/* Ignore -EPROBE_DEFER, it only matters if idx matches */

drivers/gpio/gpiolib-acpi-quirks.c

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

		},

	},

	{

		/*

		 * Same as G1619-04. New model.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "GPD"),

			DMI_MATCH(DMI_PRODUCT_NAME, "G1619-05"),

		},

		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {

			.ignore_wake = "PNP0C50:00@8",

		},

	},

	{

		/*

		 * Spurious wakeups from GPIO 11